Skip to content

Commit 951ab58

Browse files
ned-deilyned-deily
authored
Revert "bpo-26317: Support OBJC and OBJCXX configure command line variables (GH-20176)" (GH-20182)
This reverts commit 0da5466. 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.
1 parent adc72bb commit 951ab58

10 files changed

Lines changed: 15 additions & 670 deletions

File tree

‎Doc/whatsnew/3.9.rst‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -892,14 +892,6 @@ Build Changes
892892
functions are now required to build Python.
893893
(Contributed by Victor Stinner in :issue:`39395`.)
894894

895-
* The ``OBJC`` and ``OBJCXX`` standard command line options for the configure
896-
script are now supported. This allows building fot macOS with a third-party
897-
compiler, like GNU `gcc`, for everything except for the several
898-
system-specific source files that need system headers that require the
899-
Apple-supplied compile chain (e.g. the ``_scproxy`` helper module and
900-
``PythonLauncher.app``).
901-
(Contributed by Jeffrey Kintscher in :issue:`26317`.)
902-
903895

904896
C API Changes
905897
=============

‎Mac/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
2121
PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
2222
LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
2323
CC=@CC@
24-
OBJC=@OBJC@
2524
MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
2625
export MACOSX_DEPLOYMENT_TARGET
2726

‎Mac/PythonLauncher/Makefile.in‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
CC=@CC@
22
LD=@CC@
3-
OBJC=@OBJC@
4-
OBJCFLAFS=@OBJCFLAGS@
53
BASECFLAGS=@BASECFLAGS@
64
OPT=@OPT@
75
CFLAGS=@CFLAGS@ $(BASECFLAGS) $(OPT)
@@ -54,25 +52,25 @@ Python\ Launcher.app: Info.plist \
5452
cp -R $(srcdir)/English.lproj "Python Launcher.app/Contents/Resources"
5553

5654
FileSettings.o: $(srcdir)/FileSettings.m
57-
$(OBJC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m
55+
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m
5856

5957
MyAppDelegate.o: $(srcdir)/MyAppDelegate.m
60-
$(OBJC) $(CFLAGS) -o $@ -c $(srcdir)/MyAppDelegate.m
58+
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/MyAppDelegate.m
6159

6260
MyDocument.o: $(srcdir)/MyDocument.m
63-
$(OBJC) $(CFLAGS) -o $@ -c $(srcdir)/MyDocument.m
61+
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/MyDocument.m
6462

6563
PreferencesWindowController.o: $(srcdir)/PreferencesWindowController.m
66-
$(OBJC) $(CFLAGS) -o $@ -c $(srcdir)/PreferencesWindowController.m
64+
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/PreferencesWindowController.m
6765

6866
doscript.o: $(srcdir)/doscript.m
69-
$(OBJC) $(CFLAGS) -o $@ -c $(srcdir)/doscript.m
67+
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/doscript.m
7068

7169
main.o: $(srcdir)/main.m
72-
$(OBJC) $(CFLAGS) -o $@ -c $(srcdir)/main.m
70+
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/main.m
7371

7472
Python\ Launcher: $(OBJECTS)
75-
$(OBJC) $(LDFLAGS) -o "Python Launcher" $(OBJECTS) -framework AppKit -framework Carbon
73+
$(CC) $(LDFLAGS) -o "Python Launcher" $(OBJECTS) -framework AppKit -framework Carbon
7674

7775
Info.plist: $(srcdir)/Info.plist.in
7876
sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(srcdir)/Info.plist.in > Info.plist

‎Makefile.pre.in‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ abs_builddir= @abs_builddir@
3535

3636
CC= @CC@
3737
CXX= @CXX@
38-
OBJC= @OBJC@
3938
MAINCC= @MAINCC@
4039
LINKCC= @LINKCC@
4140
AR= @AR@
@@ -614,22 +613,12 @@ $(srcdir)/Modules/_blake2/blake2s_impl.c: $(srcdir)/Modules/_blake2/blake2b_impl
614613
$(PYTHON_FOR_REGEN) $(srcdir)/Modules/_blake2/blake2b2s.py
615614
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f $@
616615

617-
# _scproxy.o needs to be built outside of setup.py so that we can force
618-
# the use of the OBJC compiler when the CC compiler is different. For
619-
# example, it allows _scproxy.c to be compiled using the clang compiler
620-
# while the rest of the project uses the GNU C compiler.
621-
#
622-
# see issue #26317 for details
623-
@SCPROXY@Modules/_scproxy.o: $(srcdir)/Modules/_scproxy.c $(srcdir)/Include/Python.h
624-
@SCPROXY@ $(OBJC) -c $(CCSHARED) $(PY_CORE_CFLAGS) -o $@ $<
625-
@NOSCPROXY@.PHONY: Modules/_scproxy.o
626-
627616
# Build the shared modules
628617
# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
629618
# -s, --silent or --quiet is always the first char.
630619
# Under BSD make, MAKEFLAGS might be " -s -v x=y".
631620
# Ignore macros passed by GNU make, passed after --
632-
sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o Modules/_scproxy.o
621+
sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
633622
@case "`echo X $$MAKEFLAGS | sed 's/^X //;s/ -- .*//'`" in \
634623
*\ -s*|s*) quiet="-q";; \
635624
*) quiet="";; \

‎Misc/ACKS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,6 @@ Sam Kimbrel
882882
Tomohiko Kinebuchi
883883
James King
884884
W. Trevor King
885-
Jeffrey Kintscher
886885
Paul Kippes
887886
Steve Kirsch
888887
Sebastian Kirsche

‎Misc/NEWS.d/next/Build/2019-05-14-05-35-14.bpo-26317.no8mw-.rst‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎aclocal.m4‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ dnl
5555
dnl See the "Since" comment for each macro you use to see what version
5656
dnl of the macros you require.
5757
m4_defun([PKG_PREREQ],
58-
[m4_define([PKG_MACROS_VERSION], [0.29.2])
58+
[m4_define([PKG_MACROS_VERSION], [0.29.1])
5959
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
6060
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
6161
])dnl PKG_PREREQ
@@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
156156
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
157157
158158
pkg_failed=no
159-
AC_MSG_CHECKING([for $2])
159+
AC_MSG_CHECKING([for $1])
160160
161161
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
162162
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
166166
See the pkg-config man page for more details.])
167167
168168
if test $pkg_failed = yes; then
169-
AC_MSG_RESULT([no])
169+
AC_MSG_RESULT([no])
170170
_PKG_SHORT_ERRORS_SUPPORTED
171171
if test $_pkg_short_errors_supported = yes; then
172172
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
173-
else
173+
else
174174
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
175175
fi
176176
# Put the nasty error message in config.log where it belongs
@@ -187,7 +187,7 @@ installed software in a non-standard prefix.
187187
_PKG_TEXT])[]dnl
188188
])
189189
elif test $pkg_failed = untried; then
190-
AC_MSG_RESULT([no])
190+
AC_MSG_RESULT([no])
191191
m4_default([$4], [AC_MSG_FAILURE(
192192
[The pkg-config script could not be found or is too old. Make sure it
193193
is in your PATH or set the PKG_CONFIG environment variable to the full

0 commit comments

Comments
 (0)