@@ -451,8 +451,7 @@ LIBRARY_OBJS= \
451
451
# On some systems, object files that reference DTrace probes need to be modified
452
452
# in-place by dtrace(1).
453
453
DTRACE_DEPS = \
454
- Python/ceval.o
455
- # XXX: should gcmodule, etc. be here, too?
454
+ Python/ceval.o Python/import.o Modules/gcmodule.o
456
455
457
456
#########################################################################
458
457
# Rules
@@ -628,7 +627,7 @@ $(LIBRARY): $(LIBRARY_OBJS)
628
627
-rm -f $@
629
628
$(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)
630
629
631
- libpython$(LDVERSION).so: $(LIBRARY_OBJS)
630
+ libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
632
631
if test $(INSTSONAME) != $(LDLIBRARY); then \
633
632
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
634
633
$(LN) -f $(INSTSONAME) $@; \
@@ -640,7 +639,7 @@ libpython3.so: libpython$(LDVERSION).so
640
639
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
641
640
642
641
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
643
- $(CC) -dynamiclib -Wl,-single_module $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
642
+ $(CC) -dynamiclib -Wl,-single_module $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $( SHLIBS) $(LIBC) $(LIBM); \
644
643
645
644
646
645
libpython$(VERSION).sl: $(LIBRARY_OBJS)
@@ -752,6 +751,7 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
752
751
$(PYTHON_OBJS) \
753
752
$(MODULE_OBJS) \
754
753
$(MODOBJS) \
754
+ $(DTRACE_OBJS) \
755
755
$(srcdir)/Modules/getbuildinfo.c
756
756
$(CC) -c $(PY_CORE_CFLAGS) \
757
757
-DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
@@ -954,6 +954,10 @@ Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
954
954
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
955
955
mv $@.tmp $@
956
956
957
+ Python/ceval.o: Include/pydtrace.h
958
+ Python/import.o: Include/pydtrace.h
959
+ Modules/gcmodule.o: Include/pydtrace.h
960
+
957
961
Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
958
962
$(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
959
963
0 commit comments