diff options
| author | stratakis <cstratak@redhat.com> | 2018-11-29 14:43:24 (GMT) |
|---|---|---|
| committer | Victor Stinner <vstinner@redhat.com> | 2018-11-29 14:43:24 (GMT) |
| commit | e1b210342fa08685bf9b24eb449a2f079f1b50f5 (patch) | |
| tree | b28df3ab8bd8edff2cd69c71847b90a1a23025ac /Makefile.pre.in | |
| parent | cbf57674e257617977b35c016e861a52b5f65359 (diff) | |
| download | cpython-e1b210342fa08685bf9b24eb449a2f079f1b50f5.zip cpython-e1b210342fa08685bf9b24eb449a2f079f1b50f5.tar.gz cpython-e1b210342fa08685bf9b24eb449a2f079f1b50f5.tar.bz2 | |
[3.6] bpo-31625: Stop using ranlib (GH-10417)
* stop using ranlib (closes bpo-31625) (#3815)
Instead, simply pass 's' to ar.
* explicitly list objects for the ar command (#3824)
$^ is not portable.
closes bpo-31625
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 82f7edd..258236d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -37,7 +37,6 @@ CXX= @CXX@ MAINCC= @MAINCC@ LINKCC= @LINKCC@ AR= @AR@ -RANLIB= @RANLIB@ READELF= @READELF@ SOABI= @SOABI@ LDVERSION= @LDVERSION@ @@ -593,16 +592,9 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o # Build static library -# avoid long command lines, same as LIBRARY_OBJS $(LIBRARY): $(LIBRARY_OBJS) -rm -f $@ - $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o - $(AR) $(ARFLAGS) $@ $(PARSER_OBJS) - $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS) - $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o - $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) - $(AR) $(ARFLAGS) $@ $(MODOBJS) - $(RANLIB) $@ + $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS) libpython$(LDVERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ @@ -1435,7 +1427,6 @@ libainstall: @DEF_MAKE_RULE@ python-config $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ else \ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ fi; \ else \ echo Skip install of $(LIBRARY) - use make frameworkinstall; \ |