Skip to content

Commit 0523741

Browse files
miss-islingtonstratakis
authored andcommitted
00452: 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. Co-authored-by: stratakis <[email protected]>
1 parent fb69507 commit 0523741

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Makefile.pre.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_externa
10011001
# an include guard, so we can't use a pipeline to transform its output.
10021002
Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
10031003
$(MKDIR_P) Include
1004-
$(DTRACE) $(DFLAGS) -o $@ -h -s $<
1004+
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $<
10051005
: sed in-place edit with POSIX-only tools
10061006
sed 's/PYTHON_/PyDTrace_/' $@ > [email protected]
10071007
@@ -1011,7 +1011,7 @@ Python/import.o: $(srcdir)/Include/pydtrace.h
10111011
Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
10121012

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

10161016
Objects/typeobject.o: Objects/typeslots.inc
10171017

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The DTrace build now properly passes the ``CC`` and ``CFLAGS`` variables
2+
to the ``dtrace`` command when utilizing SystemTap on Linux.

0 commit comments

Comments
 (0)