Commit 8b2ec47b authored by Daniel Brown's avatar Daniel Brown

native compiler arg was missing from OSX build

parent 6ac428f5
......@@ -430,7 +430,7 @@ case "$1" in
"--build-linux")
NATIVE=""
TARGET=$TARGET_LINUX
CPUARCH="-m64"
="-m64"
target_arch="linux"
echo "Building Linux version :" | tee -a $LOGFILE
;;
......@@ -525,7 +525,7 @@ case $TARGET in
if [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/ ]; then
echo "Preparing Mac OS X 10.12 SDK build environment..." | tee -a $LOGFILE
export OSX_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/"
export OSX_CFLAGS=$OPTIM_CFLAGS"-isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=12"
export OSX_CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=12"
export OSX_LDFLAGS="-isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OSX_CFLAGS
export CXXFLAGS=$OSX_CFLAGS
......@@ -533,7 +533,7 @@ case $TARGET in
elif [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/ ]; then
echo "Preparing Mac OS X 10.11 SDK build environment..." | tee -a $LOGFILE
export OSX_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/"
export OSX_CFLAGS=$OPTIM_CFLAGS"-isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=11"
export OSX_CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=11"
export OSX_LDFLAGS="-isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OSX_CFLAGS
export CXXFLAGS=$OSX_CFLAGS
......@@ -541,7 +541,7 @@ case $TARGET in
elif [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/ ]; then
echo "Preparing Mac OS X 10.10 SDK build environment..." | tee -a $LOGFILE
export OSX_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/"
export OSX_CFLAGS=$OPTIM_CFLAGS"-isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=10"
export OSX_CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=10"
export OSX_LDFLAGS="-isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OSX_CFLAGS
export CXXFLAGS=$OSX_CFLAGS
......@@ -549,7 +549,7 @@ case $TARGET in
elif [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/ ]; then
echo "Preparing Mac OS X 10.9 SDK build environment..." | tee -a $LOGFILE
export OSX_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/"
export OSX_CFLAGS=$OPTIM_CFLAGS"-isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=9"
export OSX_CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=9"
export OSX_LDFLAGS="-isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OSX_CFLAGS
export CXXFLAGS=$OSX_CFLAGS
......@@ -557,7 +557,7 @@ case $TARGET in
elif [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/ ]; then
echo "Preparing Mac OS X 10.8 SDK build environment..." | tee -a $LOGFILE
export OSX_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/"
export OSX_CFLAGS=$OPTIM_CFLAGS" -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=8"
export OSX_CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=8"
export OSX_LDFLAGS=" -isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OSX_CFLAGS
export CXXFLAGS=$OSX_CFLAGS
......@@ -565,7 +565,7 @@ case $TARGET in
elif [ -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/ ]; then
echo "Preparing Mac OS X 10.7 SDK build environment..." | tee -a $LOGFILE
export OSX_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/"
export OSX_CFLAGS=$OPTIM_CFLAGS" -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=7"
export OSX_CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot $OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=7"
export OSX_LDFLAGS="-isysroot $OSX_SDK -Wl,-syslibroot,$OSX_SDK -arch $CPUARCH -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OSX_CFLAGS
export CXXFLAGS=$OSX_CFLAGS
......@@ -574,21 +574,21 @@ case $TARGET in
echo "Preparing Mac OS X 10.6 x86_64 SDK build environment..." | tee -a $LOGFILE
export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk -arch $CPUARCH $LDFLAGS"
export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch $CPUARCH $CPPFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OPTIM_CFLAGS"-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch $CPUARCH $CFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=6"
export CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch $CPUARCH $CFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=6"
export CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.6.sdk -arch $CPUARCH $CXXFLAGS"
export SDKROOT="/Developer/SDKs/MacOSX10.6.sdk"
elif [ -d /Developer/SDKs/MacOSX10.5u.sdk ]; then
echo "Preparing Mac OS X 10.5 i386 SDK build environment..." | tee -a $LOGFILE
export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -arch $CPUARCH $LDFLAGS"
export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch $CPUARCH $CPPFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OPTIM_CFLAGS"-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch $CPUARCH $CFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=5"
export CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch $CPUARCH $CFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=5"
export CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch $CPUARCH $CXXFLAGS"
export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk"
elif [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
echo "Preparing Mac OS X 10.4 i386 SDK build environment..." | tee -a $LOGFILE
export LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch $CPUARCH $LDFLAGS"
export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $CPUARCH $CPPFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET"
export CFLAGS=$OPTIM_CFLAGS"-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $CPUARCH $CFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=4"
export CFLAGS="$NATIVE $OPTIM_CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $CPUARCH $CFLAGS -DOSX_BUILD_VER=$MACOSX_DEPLOYMENT_TARGET -DMACOSX_SDK=4"
export CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch $CPUARCH $CXXFLAGS"
export SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment