Skip to content
Snippets Groups Projects
Commit a3ee3b99 authored by Moritz Angermann's avatar Moritz Angermann Committed by Marge Bot
Browse files

Drop hard Xcode dependency

XCODE_VERSION calls out to `xcodebuild`, which is only available
when having `Xcode` installed. The CommandLineTools are not
sufficient. To install Xcode, you must have an apple id to download
the Xcode.xip from apple.

We do not use xcodebuild anywhere in our build explicilty. At best
it appears to be a proxy for checking the linker or the compiler.
These should rather be done with
```
xcrun ld -version
```
or similar, and not by proxy through Xcode. The CLR should be
sufficient for building software on macOS.
parent 7397c784
No related branches found
No related tags found
No related merge requests found
...@@ -342,9 +342,6 @@ then ...@@ -342,9 +342,6 @@ then
GMP_FORCE_INTREE="YES" GMP_FORCE_INTREE="YES"
fi fi
XCODE_VERSION()
dnl ** Building a cross compiler? dnl ** Building a cross compiler?
dnl -------------------------------------------------------------- dnl --------------------------------------------------------------
CrossCompiling=NO CrossCompiling=NO
......
...@@ -94,8 +94,6 @@ then ...@@ -94,8 +94,6 @@ then
AC_MSG_ERROR([find is required.]) AC_MSG_ERROR([find is required.])
fi fi
XCODE_VERSION()
AC_ARG_ENABLE(distro-toolchain, AC_ARG_ENABLE(distro-toolchain,
[AS_HELP_STRING([--enable-distro-toolchain], [AS_HELP_STRING([--enable-distro-toolchain],
[Do not use bundled Windows toolchain binaries.])], [Do not use bundled Windows toolchain binaries.])],
......
# XCODE_VERSION()
# --------------------------------
# Gets the version number of Xcode, if on a Mac
AC_DEFUN([XCODE_VERSION],[
if test "$TargetVendor_CPP" = "apple"
then
AC_MSG_CHECKING(Xcode version)
XcodeVersion=`(xcode-select -p > /dev/null 2>&1 && xcodebuild -version) | grep Xcode | sed "s/Xcode //"`
# Old Xcode versions don't actually give the Xcode version
if test "$XcodeVersion" = ""
then
AC_MSG_RESULT(not found (too old?))
XcodeVersion1=0
XcodeVersion2=0
else
AC_MSG_RESULT($XcodeVersion)
XcodeVersion1=`echo "$XcodeVersion" | sed 's/\..*//'`
changequote(, )dnl
XcodeVersion2=`echo "$XcodeVersion" | sed 's/[^.]*\.\([^.]*\).*/\1/'`
changequote([, ])dnl
AC_MSG_NOTICE(Xcode version component 1: $XcodeVersion1)
AC_MSG_NOTICE(Xcode version component 2: $XcodeVersion2)
fi
fi
])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment