diff options
| author | Barry Warsaw <barry@python.org> | 2010-10-16 01:04:07 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2010-10-16 01:04:07 (GMT) |
| commit | 8cf4eae522592549a92b7b599838f63ba56120cd (patch) | |
| tree | 76c8a9608c4efa297a67938429970361e3655d1f /Makefile.pre.in | |
| parent | d8d835bd1daa2d097c0d9a9ad1826d2bc111e19e (diff) | |
| download | cpython-8cf4eae522592549a92b7b599838f63ba56120cd.zip cpython-8cf4eae522592549a92b7b599838f63ba56120cd.tar.gz cpython-8cf4eae522592549a92b7b599838f63ba56120cd.tar.bz2 | |
First (uncontroversial) part of issue 9807.
* Expose the build flags to Python as sys.abiflags
* Shared library libpythonX.Y<abiflags>.so
* python-config --abiflags
* Make two distutils tests that failed with --enable-shared (even before this
patch) succeed.
* Fix a few small style issues.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 905318e..b66313b 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -36,6 +36,7 @@ AR= @AR@ RANLIB= @RANLIB@ SVNVERSION= @SVNVERSION@ SOABI= @SOABI@ +LDVERSION= @LDVERSION@ GNULD= @GNULD@ @@ -102,6 +103,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include SCRIPTDIR= $(prefix)/lib +ABIFLAGS= @ABIFLAGS@ # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) @@ -445,7 +447,7 @@ $(LIBRARY): $(LIBRARY_OBJS) $(AR) $(ARFLAGS) $@ $(MODOBJS) $(RANLIB) $@ -libpython$(VERSION).so: $(LIBRARY_OBJS) +libpython$(LDVERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ $(LN) -f $(INSTSONAME) $@; \ @@ -566,6 +568,11 @@ Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile -DSOABI='"$(SOABI)"' \ -o $@ $(srcdir)/Python/dynload_shlib.c +Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile + $(CC) -c $(PY_CORE_CFLAGS) \ + -DABIFLAGS='"$(ABIFLAGS)"' \ + -o $@ $(srcdir)/Python/sysmodule.c + $(IO_OBJS): $(IO_H) # Use a stamp file to prevent make -j invoking pgen twice |