summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/xcconfig/base/arch.i386.xcconfig1
-rw-r--r--macosx/xcconfig/base/os.osx1010.xcconfig1
-rw-r--r--macosx/xcconfig/base/os.osx106.xcconfig2
-rw-r--r--macosx/xcconfig/base/os.osx107.xcconfig1
-rw-r--r--macosx/xcconfig/base/os.osx108.xcconfig1
-rw-r--r--macosx/xcconfig/base/os.osx109.xcconfig1
-rw-r--r--macosx/xcconfig/osx1010.i386.xcconfig3
-rw-r--r--macosx/xcconfig/osx1010.x86_64.xcconfig3
-rw-r--r--macosx/xcconfig/osx106.i386.xcconfig3
-rw-r--r--macosx/xcconfig/osx106.x86_64.xcconfig3
-rw-r--r--macosx/xcconfig/osx107.i386.xcconfig3
-rw-r--r--macosx/xcconfig/osx107.x86_64.xcconfig3
-rw-r--r--macosx/xcconfig/osx108.i386.xcconfig3
-rw-r--r--macosx/xcconfig/osx108.x86_64.xcconfig3
-rw-r--r--macosx/xcconfig/osx109.i386.xcconfig3
-rw-r--r--macosx/xcconfig/osx109.x86_64.xcconfig3
-rwxr-xr-xmake/config.guess19
-rw-r--r--make/configure.py22
-rwxr-xr-xmake/test/build.matrix9
19 files changed, 4 insertions, 83 deletions
diff --git a/macosx/xcconfig/base/arch.i386.xcconfig b/macosx/xcconfig/base/arch.i386.xcconfig
deleted file mode 100644
index 8f2cab54b..000000000
--- a/macosx/xcconfig/base/arch.i386.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-ARCHS = i386
diff --git a/macosx/xcconfig/base/os.osx1010.xcconfig b/macosx/xcconfig/base/os.osx1010.xcconfig
deleted file mode 100644
index e6a6a4eb3..000000000
--- a/macosx/xcconfig/base/os.osx1010.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET = 10.10
diff --git a/macosx/xcconfig/base/os.osx106.xcconfig b/macosx/xcconfig/base/os.osx106.xcconfig
deleted file mode 100644
index 2d42c9356..000000000
--- a/macosx/xcconfig/base/os.osx106.xcconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET = 10.6
-CLANG_LINK_OBJC_RUNTIME = NO
diff --git a/macosx/xcconfig/base/os.osx107.xcconfig b/macosx/xcconfig/base/os.osx107.xcconfig
deleted file mode 100644
index 6a4b42233..000000000
--- a/macosx/xcconfig/base/os.osx107.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET = 10.7
diff --git a/macosx/xcconfig/base/os.osx108.xcconfig b/macosx/xcconfig/base/os.osx108.xcconfig
deleted file mode 100644
index e6b07f6a8..000000000
--- a/macosx/xcconfig/base/os.osx108.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET = 10.8
diff --git a/macosx/xcconfig/base/os.osx109.xcconfig b/macosx/xcconfig/base/os.osx109.xcconfig
deleted file mode 100644
index d68f7b364..000000000
--- a/macosx/xcconfig/base/os.osx109.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET = 10.9
diff --git a/macosx/xcconfig/osx1010.i386.xcconfig b/macosx/xcconfig/osx1010.i386.xcconfig
deleted file mode 100644
index beb8e3335..000000000
--- a/macosx/xcconfig/osx1010.i386.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx1010.xcconfig"
-#include "base/arch.i386.xcconfig"
-EXTERNAL_XCCONFIG = osx1010.i386
diff --git a/macosx/xcconfig/osx1010.x86_64.xcconfig b/macosx/xcconfig/osx1010.x86_64.xcconfig
deleted file mode 100644
index 5f17649c5..000000000
--- a/macosx/xcconfig/osx1010.x86_64.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx1010.xcconfig"
-#include "base/arch.x86_64.xcconfig"
-EXTERNAL_XCCONFIG = osx1010.x86_64
diff --git a/macosx/xcconfig/osx106.i386.xcconfig b/macosx/xcconfig/osx106.i386.xcconfig
deleted file mode 100644
index 1f0edd35a..000000000
--- a/macosx/xcconfig/osx106.i386.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx106.xcconfig"
-#include "base/arch.i386.xcconfig"
-EXTERNAL_XCCONFIG = osx106.i386
diff --git a/macosx/xcconfig/osx106.x86_64.xcconfig b/macosx/xcconfig/osx106.x86_64.xcconfig
deleted file mode 100644
index cc9606ef7..000000000
--- a/macosx/xcconfig/osx106.x86_64.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx106.xcconfig"
-#include "base/arch.x86_64.xcconfig"
-EXTERNAL_XCCONFIG = osx106.x86_64
diff --git a/macosx/xcconfig/osx107.i386.xcconfig b/macosx/xcconfig/osx107.i386.xcconfig
deleted file mode 100644
index 6b19b287b..000000000
--- a/macosx/xcconfig/osx107.i386.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx107.xcconfig"
-#include "base/arch.i386.xcconfig"
-EXTERNAL_XCCONFIG = osx107.i386
diff --git a/macosx/xcconfig/osx107.x86_64.xcconfig b/macosx/xcconfig/osx107.x86_64.xcconfig
deleted file mode 100644
index d1c434e45..000000000
--- a/macosx/xcconfig/osx107.x86_64.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx107.xcconfig"
-#include "base/arch.x86_64.xcconfig"
-EXTERNAL_XCCONFIG = osx107.x86_64
diff --git a/macosx/xcconfig/osx108.i386.xcconfig b/macosx/xcconfig/osx108.i386.xcconfig
deleted file mode 100644
index d3dcc668c..000000000
--- a/macosx/xcconfig/osx108.i386.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx108.xcconfig"
-#include "base/arch.i386.xcconfig"
-EXTERNAL_XCCONFIG = osx108.i386
diff --git a/macosx/xcconfig/osx108.x86_64.xcconfig b/macosx/xcconfig/osx108.x86_64.xcconfig
deleted file mode 100644
index 4e602e8ab..000000000
--- a/macosx/xcconfig/osx108.x86_64.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx108.xcconfig"
-#include "base/arch.x86_64.xcconfig"
-EXTERNAL_XCCONFIG = osx108.x86_64
diff --git a/macosx/xcconfig/osx109.i386.xcconfig b/macosx/xcconfig/osx109.i386.xcconfig
deleted file mode 100644
index 995d659c9..000000000
--- a/macosx/xcconfig/osx109.i386.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx109.xcconfig"
-#include "base/arch.i386.xcconfig"
-EXTERNAL_XCCONFIG = osx109.i386
diff --git a/macosx/xcconfig/osx109.x86_64.xcconfig b/macosx/xcconfig/osx109.x86_64.xcconfig
deleted file mode 100644
index 21069e286..000000000
--- a/macosx/xcconfig/osx109.x86_64.xcconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "base/os.osx109.xcconfig"
-#include "base/arch.x86_64.xcconfig"
-EXTERNAL_XCCONFIG = osx109.x86_64
diff --git a/make/config.guess b/make/config.guess
index 02cf497ba..f200dcf89 100755
--- a/make/config.guess
+++ b/make/config.guess
@@ -1268,17 +1268,11 @@ EOF
SX-ACE:SUPER-UX:*:*)
echo sxace-nec-superux${UNAME_RELEASE}
exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
- *:Rhapsody:*:*)
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
eval $set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
+ UNAME_PROCESSOR=x86_64
fi
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
@@ -1288,24 +1282,15 @@ EOF
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
esac
fi
- # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
- if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_PPC >/dev/null
- then
- UNAME_PROCESSOR=powerpc
- fi
fi
elif test "$UNAME_PROCESSOR" = i386 ; then
# Avoid executing cc on OS X 10.9, as it ships with a stub
# that puts up a graphical alert prompting to install
# developer tools. Any system running Mac OS X 10.7 or
# later (Darwin 11 and later) is required to have a 64-bit
- # processor. This is not true of the ARM version of Darwin
- # that Apple uses in portable devices.
+ # processor.
UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/make/configure.py b/make/configure.py
index eb12c34c9..1746f7a74 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -495,10 +495,8 @@ class ChkLib( Action ):
##
## example results from various platforms:
##
-## powerpc-apple-darwin9.6.0 (Mac OS X 10.5.6 PPC)
-## i386-apple-darwin9.6.0 (Mac OS X 10.5.6 Intel)
-## x86_64-apple-darwin10.8.0 (Mac OS X 10.6.8 Intel)
-## x86_64-apple-darwin11.2.0 (Mac OS X 10.7.2 Intel)
+## x86_64-apple-darwin15.6.0 (Mac OS X 10.11.6 Intel)
+## x86_64-apple-darwin16.6.0 (macOS 10.12.6 Intel)
## i686-pc-cygwin (Cygwin, Microsoft Vista)
## x86_64-unknown-linux-gnu (Linux, Fedora 10 x86_64)
##
@@ -675,24 +673,8 @@ class ArchAction( Action ):
pass
elif host_tuple.match( '*-*-mingw*' ):
pass
- elif host_tuple.match( '*-*-darwin11.*' ):
- self.mode['i386'] = 'i386-apple-darwin%s' % (host_tuple.release)
- self.mode['x86_64'] = 'x86_64-apple-darwin%s' % (host_tuple.release)
elif host_tuple.match( '*-*-darwin*' ):
- self.mode['i386'] = 'i386-apple-darwin%s' % (host_tuple.release)
self.mode['x86_64'] = 'x86_64-apple-darwin%s' % (host_tuple.release)
- self.mode['ppc'] = 'powerpc-apple-darwin%s' % (host_tuple.release)
- self.mode['ppc64'] = 'powerpc64-apple-darwin%s' % (host_tuple.release)
-
- ## special cases in that powerpc does not match gcc -arch value
- ## which we like to use; so it has to be removed.
- ## note: we don't know if apple will release Snow Leopard/ppc64 yet; just a guess.
- if 'powerpc' in self.mode:
- del self.mode['powerpc']
- self.mode.mode = 'ppc'
- elif 'powerpc64' in self.mode:
- del self.mode['powerpc64']
- self.mode.mode = 'ppc64'
elif host_tuple.match( '*-*-linux*' ):
pass
elif host_tuple.match( '*-*-solaris*' ):
diff --git a/make/test/build.matrix b/make/test/build.matrix
index 70d07445b..2304e7a36 100755
--- a/make/test/build.matrix
+++ b/make/test/build.matrix
@@ -112,15 +112,6 @@ end
## create work queue
queue = Queue.new
-## create xcconfig list
-xclist = []
-case
-when RUBY_PLATFORM =~ /darwin11/
- xclist += 'native osx106.i386 osx106.x86_64 osx107.i386 osx107.x86_64'.split
-when RUBY_PLATFORM =~ /darwin10/
- xclist += 'native osx106.i386 osx106.x86_64'.split
-end
-
## fill queue
[['release',''],['debug','--debug=max --optimize=none']].each do |debug|
[BuildTerminal, BuildLaunch].each do |kind|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 21:03:52 +0000