diff options
| author | Ned Deily <nad@python.org> | 2020-05-18 15:31:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 15:31:21 (GMT) |
| commit | 951ab58024de9b5a21f0b979cdbea51e1049d781 (patch) | |
| tree | 1ea404d9518f6db5d8c1f16435366a8c1716b365 /Makefile.pre.in | |
| parent | adc72bb2f9a5d8b548ee04405e19a184e5699e8d (diff) | |
| download | cpython-951ab58024de9b5a21f0b979cdbea51e1049d781.zip cpython-951ab58024de9b5a21f0b979cdbea51e1049d781.tar.gz cpython-951ab58024de9b5a21f0b979cdbea51e1049d781.tar.bz2 | |
Revert "bpo-26317: Support OBJC and OBJCXX configure command line variables (GH-20176)" (GH-20182)
This reverts commit 0da546665075aefbb476e192ed64122d340164f4.
The commit is causing make failures on a FreeBSD buildbot.
Due to the imminent 3.9.0b1 cutoff, revert this commit for
now pending further investigation.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 339cbfd..dbfd805 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -35,7 +35,6 @@ abs_builddir= @abs_builddir@ CC= @CC@ CXX= @CXX@ -OBJC= @OBJC@ MAINCC= @MAINCC@ LINKCC= @LINKCC@ AR= @AR@ @@ -614,22 +613,12 @@ $(srcdir)/Modules/_blake2/blake2s_impl.c: $(srcdir)/Modules/_blake2/blake2b_impl $(PYTHON_FOR_REGEN) $(srcdir)/Modules/_blake2/blake2b2s.py $(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f $@ -# _scproxy.o needs to be built outside of setup.py so that we can force -# the use of the OBJC compiler when the CC compiler is different. For -# example, it allows _scproxy.c to be compiled using the clang compiler -# while the rest of the project uses the GNU C compiler. -# -# see issue #26317 for details -@SCPROXY@Modules/_scproxy.o: $(srcdir)/Modules/_scproxy.c $(srcdir)/Include/Python.h -@SCPROXY@ $(OBJC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $< -@NOSCPROXY@.PHONY: Modules/_scproxy.o - # Build the shared modules # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for # -s, --silent or --quiet is always the first char. # Under BSD make, MAKEFLAGS might be " -s -v x=y". # Ignore macros passed by GNU make, passed after -- -sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o Modules/_scproxy.o +sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o @case "`echo X $$MAKEFLAGS | sed 's/^X //;s/ -- .*//'`" in \ *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ |