Skip to content

Commit bac6e63

Browse files
bpo-37215: Fix dtrace issue introduce by bpo-36842 (GH-13940)
Signed-off-by: Christian Heimes <christian@python.org> https://bugs.python.org/issue37215 (cherry picked from commit 8a8b59c) Co-authored-by: Christian Heimes <christian@python.org>
1 parent 3f7629d commit bac6e63

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ LIBRARY_OBJS= \
438438
# On some systems, object files that reference DTrace probes need to be modified
439439
# in-place by dtrace(1).
440440
DTRACE_DEPS = \
441-
Python/ceval.o Python/import.o Modules/gcmodule.o
441+
Python/ceval.o Python/import.o Python/sysmodule.o Modules/gcmodule.o
442442

443443
#########################################################################
444444
# Rules
@@ -780,7 +780,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
780780
-DSHLIB_EXT='"$(EXT_SUFFIX)"' \
781781
-o $@ $(srcdir)/Python/dynload_hpux.c
782782

783-
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
783+
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h
784784
$(CC) -c $(PY_CORE_CFLAGS) \
785785
-DABIFLAGS='"$(ABIFLAGS)"' \
786786
$(MULTIARCH_CPPFLAGS) \
@@ -938,9 +938,9 @@ Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
938938
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
939939
mv $@.tmp $@
940940

941-
Python/ceval.o: Include/pydtrace.h
942-
Python/import.o: Include/pydtrace.h
943-
Modules/gcmodule.o: Include/pydtrace.h
941+
Python/ceval.o: $(srcdir)/Include/pydtrace.h
942+
Python/import.o: $(srcdir)/Include/pydtrace.h
943+
Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
944944

945945
Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
946946
$(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix dtrace issue introduce by bpo-36842

0 commit comments

Comments
 (0)