[iortcw] 326/497: All: Remove duplicated compiler flags from Mac build scripts
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 9d31e0e1dc0dcf11e0d4348080778385aed8294c Author: MAN-AT-ARMS Date: Tue Mar 24 17:12:06 2015 -0400 All: Remove duplicated compiler flags from Mac build scripts --- MP/make-macosx-ub.sh | 21 ++--- MP/make-macosx_xcode3.sh | 7 ++- MP/make-macosx_xcode4.sh | 8 ++-- MP/make-macosx_xcode5.sh | 8 ++-- SP/make-macosx-ub.sh | 21 ++--- SP/make-macosx_xcode3.sh | 7 ++- SP/make-macosx_xcode4.sh | 8 ++-- SP/make-macosx_xcode5.sh | 8 ++-- 8 files changed, 24 insertions(+), 64 deletions(-) diff --git a/MP/make-macosx-ub.sh b/MP/make-macosx-ub.sh index d2801eb..33c7b67 100755 --- a/MP/make-macosx-ub.sh +++ b/MP/make-macosx-ub.sh @@ -58,29 +58,20 @@ TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : unset X86_64_SDK unset X86_64_CFLAGS -unset X86_64_LDFLAGS unset X86_SDK unset X86_CFLAGS -unset X86_LDFLAGS unset PPC_64_SDK unset PPC_CFLAGS -unset PPC_LDFLAGS if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then X86_64_SDK=/Developer/SDKs/MacOSX10.5.sdk - X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - X86_64_LDFLAGS=" -mmacosx-version-min=10.5" + X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" X86_SDK=/Developer/SDKs/MacOSX10.5.sdk - X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - X86_LDFLAGS=" -mmacosx-version-min=10.5" + X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk" PPC_SDK=/Developer/SDKs/MacOSX10.5.sdk - PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - PPC_LDFLAGS=" -mmacosx-version-min=10.5" + PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk" fi if [ -z $X86_64_SDK ] || [ -z $X86_SDK ] || [ -z $PPC_SDK ]; then @@ -117,7 +108,7 @@ NCPU=`sysctl -n hw.ncpu` if [ -d build/release-release-x86_64 ]; then rm -r build/release-darwin-x86_64 fi -(ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS LDFLAGS=$X86_64_LDFLAGS make -j$NCPU) || exit 1; +(ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS make -j$NCPU) || exit 1; echo;echo @@ -125,7 +116,7 @@ echo;echo if [ -d build/release-darwin-x86 ]; then rm -r build/release-darwin-x86 fi -(ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1; +(ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS make -j$NCPU) || exit 1; echo;echo @@ -133,7 +124,7 @@ echo;echo if [ -d build/release-darwin-ppc ]; then rm -r build/release-darwin-ppc fi -(ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS LDFLAGS=$PPC_LDFLAGS make -j$NCPU) || exit 1; +(ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS make -j$NCPU) || exit 1; echo;echo diff --git a/MP/make-macosx_xcode3.sh b/MP/make-macosx_xcode3.sh index 04cad71..fb303e8 100755 --- a/MP/make-macosx_xcode3.sh +++ b/MP/make-macosx_xcode3.sh @@ -72,13 +72,10 @@ TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : unset ARCH_SDK unset ARCH_CFLAGS -unset ARCH_LDFLAGS if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then ARCH_SDK=/Developer/SDKs/MacOSX10.5.sdk - ARCH_CFLAGS="-arch ${ARCH} -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - ARCH_LDFLAGS=" -mmacosx-version-min=10.5" + ARCH_CFLAGS="-arch ${ARCH} -isysroot /Developer/SDKs/MacOSX10.5.sdk" fi @@ -97,7 +94,7 @@ NCPU=`sysctl -n hw.ncpu` if [ -d build/release-darwin-${BUILDARCH} ]; then rm -r build/release-darwin-${BUILDARCH} fi -(CC=${CC} ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS LDFLAGS=$ARCH_LDFLAGS make -j$NCPU) || exit 1; +(CC=${CC} ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS make -j$NCPU) || exit 1; echo "Creating .app bundle $DESTDIR/$APPBUNDLE" if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then diff --git a/MP/make-macosx_xcode4.sh b/MP/make-macosx_xcode4.sh index b2a70d0..d04a54c 100755 --- a/MP/make-macosx_xcode4.sh +++ b/MP/make-macosx_xcode4.sh @@ -61,13 +61,9 @@ Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'` # "8" is the Darwin major kernel version. TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'` -# we want to use the oldest available SDK (10.6) for max compatiblity. - unset ARCH_CFLAGS -unset ARCH_LDFLAGS -ARCH_CFLAGS="-arch ${ARCH} -DMAC_OS_X_VERSION_MIN_REQUIRED=1060" -ARCH_LDFLAGS=" -mmacosx-version-min=10.6" +ARCH_CFLAGS="-arch ${ARCH}" if [ ! -d $DESTDIR ]; then mkdir -p $DESTDIR @@ -81,7 +77,7 @@ NCPU=`sysctl -n hw.ncpu` if [ -d build/release-darwin-${BUILDARCH} ]; then rm -r build/release-d
[iortcw] 326/497: All: Remove duplicated compiler flags from Mac build scripts
This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw. commit 9d31e0e1dc0dcf11e0d4348080778385aed8294c Author: MAN-AT-ARMS Date: Tue Mar 24 17:12:06 2015 -0400 All: Remove duplicated compiler flags from Mac build scripts --- MP/make-macosx-ub.sh | 21 ++--- MP/make-macosx_xcode3.sh | 7 ++- MP/make-macosx_xcode4.sh | 8 ++-- MP/make-macosx_xcode5.sh | 8 ++-- SP/make-macosx-ub.sh | 21 ++--- SP/make-macosx_xcode3.sh | 7 ++- SP/make-macosx_xcode4.sh | 8 ++-- SP/make-macosx_xcode5.sh | 8 ++-- 8 files changed, 24 insertions(+), 64 deletions(-) diff --git a/MP/make-macosx-ub.sh b/MP/make-macosx-ub.sh index d2801eb..33c7b67 100755 --- a/MP/make-macosx-ub.sh +++ b/MP/make-macosx-ub.sh @@ -58,29 +58,20 @@ TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : unset X86_64_SDK unset X86_64_CFLAGS -unset X86_64_LDFLAGS unset X86_SDK unset X86_CFLAGS -unset X86_LDFLAGS unset PPC_64_SDK unset PPC_CFLAGS -unset PPC_LDFLAGS if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then X86_64_SDK=/Developer/SDKs/MacOSX10.5.sdk - X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - X86_64_LDFLAGS=" -mmacosx-version-min=10.5" + X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" X86_SDK=/Developer/SDKs/MacOSX10.5.sdk - X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - X86_LDFLAGS=" -mmacosx-version-min=10.5" + X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk" PPC_SDK=/Developer/SDKs/MacOSX10.5.sdk - PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - PPC_LDFLAGS=" -mmacosx-version-min=10.5" + PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk" fi if [ -z $X86_64_SDK ] || [ -z $X86_SDK ] || [ -z $PPC_SDK ]; then @@ -117,7 +108,7 @@ NCPU=`sysctl -n hw.ncpu` if [ -d build/release-release-x86_64 ]; then rm -r build/release-darwin-x86_64 fi -(ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS LDFLAGS=$X86_64_LDFLAGS make -j$NCPU) || exit 1; +(ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS make -j$NCPU) || exit 1; echo;echo @@ -125,7 +116,7 @@ echo;echo if [ -d build/release-darwin-x86 ]; then rm -r build/release-darwin-x86 fi -(ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1; +(ARCH=x86 CC=gcc-4.0 CFLAGS=$X86_CFLAGS make -j$NCPU) || exit 1; echo;echo @@ -133,7 +124,7 @@ echo;echo if [ -d build/release-darwin-ppc ]; then rm -r build/release-darwin-ppc fi -(ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS LDFLAGS=$PPC_LDFLAGS make -j$NCPU) || exit 1; +(ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS make -j$NCPU) || exit 1; echo;echo diff --git a/MP/make-macosx_xcode3.sh b/MP/make-macosx_xcode3.sh index 04cad71..fb303e8 100755 --- a/MP/make-macosx_xcode3.sh +++ b/MP/make-macosx_xcode3.sh @@ -72,13 +72,10 @@ TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : unset ARCH_SDK unset ARCH_CFLAGS -unset ARCH_LDFLAGS if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then ARCH_SDK=/Developer/SDKs/MacOSX10.5.sdk - ARCH_CFLAGS="-arch ${ARCH} -isysroot /Developer/SDKs/MacOSX10.5.sdk \ - -DMAC_OS_X_VERSION_MIN_REQUIRED=1050" - ARCH_LDFLAGS=" -mmacosx-version-min=10.5" + ARCH_CFLAGS="-arch ${ARCH} -isysroot /Developer/SDKs/MacOSX10.5.sdk" fi @@ -97,7 +94,7 @@ NCPU=`sysctl -n hw.ncpu` if [ -d build/release-darwin-${BUILDARCH} ]; then rm -r build/release-darwin-${BUILDARCH} fi -(CC=${CC} ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS LDFLAGS=$ARCH_LDFLAGS make -j$NCPU) || exit 1; +(CC=${CC} ARCH=${BUILDARCH} CFLAGS=$ARCH_CFLAGS make -j$NCPU) || exit 1; echo "Creating .app bundle $DESTDIR/$APPBUNDLE" if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then diff --git a/MP/make-macosx_xcode4.sh b/MP/make-macosx_xcode4.sh index b2a70d0..d04a54c 100755 --- a/MP/make-macosx_xcode4.sh +++ b/MP/make-macosx_xcode4.sh @@ -61,13 +61,9 @@ Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'` # "8" is the Darwin major kernel version. TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'` -# we want to use the oldest available SDK (10.6) for max compatiblity. - unset ARCH_CFLAGS -unset ARCH_LDFLAGS -ARCH_CFLAGS="-arch ${ARCH} -DMAC_OS_X_VERSION_MIN_REQUIRED=1060" -ARCH_LDFLAGS=" -mmacosx-version-min=10.6" +ARCH_CFLAGS="-arch ${ARCH}" if [ ! -d $DESTDIR ]; then mkdir -p $DESTDIR @@ -81,7 +77,7 @@ NCPU=`sysctl -n hw.ncpu` if [ -d build/release-darwin-${BUILDARCH} ]; then rm -r build/release-d