Skip to content

Commit

Permalink
bpo-37215: Fix dtrace issue introduce by bpo-36842 (GH-13940)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Heimes <christian@python.org>


https://bugs.python.org/issue37215
  • Loading branch information
tiran authored and miss-islington committed Jun 10, 2019
1 parent e042a45 commit 8a8b59c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ LIBRARY_OBJS= \
# On some systems, object files that reference DTrace probes need to be modified
# in-place by dtrace(1).
DTRACE_DEPS = \
Python/ceval.o Python/import.o Modules/gcmodule.o
Python/ceval.o Python/import.o Python/sysmodule.o Modules/gcmodule.o

#########################################################################
# Rules
Expand Down Expand Up @@ -780,7 +780,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
-DSHLIB_EXT='"$(EXT_SUFFIX)"' \
-o $@ $(srcdir)/Python/dynload_hpux.c

Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h
$(CC) -c $(PY_CORE_CFLAGS) \
-DABIFLAGS='"$(ABIFLAGS)"' \
$(MULTIARCH_CPPFLAGS) \
Expand Down Expand Up @@ -938,9 +938,9 @@ Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
mv $@.tmp $@

Python/ceval.o: Include/pydtrace.h
Python/import.o: Include/pydtrace.h
Modules/gcmodule.o: Include/pydtrace.h
Python/ceval.o: $(srcdir)/Include/pydtrace.h
Python/import.o: $(srcdir)/Include/pydtrace.h
Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h

Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
$(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix dtrace issue introduce by bpo-36842

0 comments on commit 8a8b59c

Please sign in to comment.