diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/config.guess | 19 | ||||
| -rw-r--r-- | make/configure.py | 22 | ||||
| -rwxr-xr-x | make/test/build.matrix | 9 |
3 files changed, 4 insertions, 46 deletions
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| |