mirror of
https://github.com/openai/codex.git
synced 2026-09-10 20:26:47 +00:00
53ba408a2f
The musl CLI allocator needs declared native tools and consistent header flags. Configure `tikv-jemalloc-sys` to use Bazel's Make toolchain and LLVM's `llvm-nm` and `llvm-ranlib`, and patch its build script to honor `MAKE`. Preserve `CFLAGS` and `CXXFLAGS` when generating jemalloc header dependencies so dependency generation uses the same compiler flags as compilation. GitOrigin-RevId: 4022b587ce0c8bce9331c541adbdf29c1d245558
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
diff --git a/jemalloc/Makefile.in b/jemalloc/Makefile.in
|
|
--- a/jemalloc/Makefile.in
|
|
+++ b/jemalloc/Makefile.in
|
|
@@ -508,7 +508,7 @@
|
|
@mkdir -p $(@D)
|
|
$(CC) $(CFLAGS) -c $(CPPFLAGS) $(CTARGET) $<
|
|
ifdef CC_MM
|
|
- @$(CC) -MM $(CPPFLAGS) -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
+ @$(CC) $(CFLAGS) -MM $(CPPFLAGS) -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
endif
|
|
|
|
$(C_SYMS): %.sym:
|
|
@@ -532,7 +532,7 @@
|
|
@mkdir -p $(@D)
|
|
$(CXX) $(CXXFLAGS) -c $(CPPFLAGS) $(CTARGET) $<
|
|
ifdef CC_MM
|
|
- @$(CXX) -MM $(CPPFLAGS) -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
+ @$(CXX) $(CXXFLAGS) -MM $(CPPFLAGS) -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
endif
|
|
|
|
ifneq ($(SOREV),$(SO))
|
|
@@ -589,14 +589,14 @@
|
|
@mkdir -p $(@D)
|
|
$(CC) $(CFLAGS) -c $(CPPFLAGS) -DJEMALLOC_STRESS_TEST -I$(srcroot)test/include -I$(objroot)test/include $(CTARGET) $<
|
|
ifdef CC_MM
|
|
- @$(CC) -MM $(CPPFLAGS) -DJEMALLOC_STRESS_TEST -I$(srcroot)test/include -I$(objroot)test/include -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
+ @$(CC) $(CFLAGS) -MM $(CPPFLAGS) -DJEMALLOC_STRESS_TEST -I$(srcroot)test/include -I$(objroot)test/include -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
endif
|
|
|
|
$(objroot)test/stress/pa/%.$(O): $(srcroot)test/stress/pa/%.cpp
|
|
@mkdir -p $(@D)
|
|
$(CXX) $(CXXFLAGS) -c $(CPPFLAGS) -I$(srcroot)test/include -I$(objroot)test/include $(CTARGET) $<
|
|
ifdef CC_MM
|
|
- @$(CXX) -MM $(CPPFLAGS) -I$(srcroot)test/include -I$(objroot)test/include -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
+ @$(CXX) $(CXXFLAGS) -MM $(CPPFLAGS) -I$(srcroot)test/include -I$(objroot)test/include -MT $@ -o $(@:%.$(O)=%.d) $<
|
|
endif
|
|
|
|
build_lib_shared: $(DSOS)
|