Skip to content

Commit f2f2ce0

Browse files
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 <cstratak@redhat.com>
1 parent f6a25b5 commit f2f2ce0

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
@@ -892,13 +892,13 @@ Python/frozen.o: $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib_externa
892892
# an include guard, so we can't use a pipeline to transform its output.
893893
Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
894894
$(MKDIR_P) Include
895-
$(DTRACE) $(DFLAGS) -o $@ -h -s $<
895+
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $<
896896
: sed in-place edit with POSIX-only tools
897897
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
898898
mv $@.tmp $@
899899

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

903903
Objects/typeobject.o: Objects/typeslots.inc
904904

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)