Skip to content

Commit d6108df

Browse files
committed
gh-131865: Properly apply exported CFLAGS for dtrace/systemtap builds
When using --with-dtrace the resulting object file could be missing specific CFLAGS exported by the build system due to the systemtap script using specific defaults. Exporting the CC and CFLAGS variables before the dtrace invocation allows us to properly apply CFLAGS exported by the build system even when cross-compiling. The fix does not affect the dtrace invocation on Solaris/Oracle/MacOS
1 parent 9c1e85f commit d6108df

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile.pre.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,7 +2090,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT)
20902090
# an include guard, so we can't use a pipeline to transform its output.
20912091
Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
20922092
$(MKDIR_P) Include
2093-
$(DTRACE) $(DFLAGS) -o $@ -h -s $<
2093+
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $<
20942094
: sed in-place edit with POSIX-only tools
20952095
sed 's/PYTHON_/PyDTrace_/' $@ > [email protected]
20962096
@@ -2100,7 +2100,7 @@ Python/gc.o: $(srcdir)/Include/pydtrace.h
21002100
Python/import.o: $(srcdir)/Include/pydtrace.h
21012101

21022102
Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
2103-
$(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
2103+
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
21042104

21052105
Objects/typeobject.o: Objects/typeslots.inc
21062106

0 commit comments

Comments
 (0)