From: Ian Silvester <iansilvester@fastmail.fm>
Date: Tue, 19 Jan 2016 02:56:43 +0000 (+0000)
Subject: Added explicit path to SYSROOT variable assignment since xcode-select no longer seems... 
X-Git-Url: http://www.privoxy.org/gitweb/index.html?p=OSXPackageBuilder.git;a=commitdiff_plain;h=b6da8f0b22de91e82c792daa9bd06d246cf8d330

Added explicit path to SYSROOT variable assignment since xcode-select no longer seems to return the expected path
---

diff --git a/common.sh b/common.sh
index 1b97b09..44918b0 100755
--- a/common.sh
+++ b/common.sh
@@ -42,13 +42,16 @@
 release_name=$1
 
 #
-# check the release name
+# check the release name and assign the build variables accordingly
+#
+# NOTE: SYSROOT ought to be programmatically determined using XCODE_PATH, however since upgrading my build environment to El Capitan xcode-select returns a non-useful path, hence I am forced to set the SYSROOT explicitly for my build environment, which is now a hybrid of XCode 3.2.6 'running' on OS X 10.11. I am not going to risk upgrading XCode for fear of losing the ability to target down-level OS X versions.
 #
 case "${release_name}" in
   # Mac OS X 10.7 (x86_64 only)
   "lion")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.7.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.7.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.7.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.7"
     ARCH="-arch x86_64"
     STARTUP="LaunchDaemon"
@@ -56,7 +59,8 @@ case "${release_name}" in
   # Mac OS X 10.6 x86_64
   "snowleopardx64")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.6"
     ARCH="-arch x86_64"
     STARTUP="LaunchDaemon"
@@ -64,7 +68,8 @@ case "${release_name}" in
   # Mac OS X 10.6 all supported architectures
   "snowleopard")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.6"
     ARCH="-arch x86_64 -arch i386"
     STARTUP="LaunchDaemon"
@@ -72,7 +77,8 @@ case "${release_name}" in
   # Mac OS X 10.6 i386
   "snowleopardi386")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.6"
     ARCH="-arch i386"
     STARTUP="LaunchDaemon"
@@ -80,7 +86,8 @@ case "${release_name}" in
   # Mac OS X 10.5 and all later releases
   "leopardupwards")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.5"
     ARCH="-arch x86_64 -arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
@@ -88,7 +95,8 @@ case "${release_name}" in
   # Mac OS X 10.5 all supported architectures
   "leopard")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.5"
     ARCH="-arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
@@ -96,7 +104,8 @@ case "${release_name}" in
   # Mac OS X 10.5 i386
   "leopardi386")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.5"
     ARCH="-arch i386"
     STARTUP="LaunchDaemon"
@@ -104,7 +113,8 @@ case "${release_name}" in
   # Mac OS X 10.5 PPC
   "leopardppc")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.5"
     ARCH="-arch ppc"
     STARTUP="LaunchDaemon"
@@ -112,7 +122,8 @@ case "${release_name}" in
   # Mac OS X 10.4 all supported architectures
   "tiger")
     XCODE_PATH="/Developer"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.4"
     ARCH="-arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
@@ -120,7 +131,8 @@ case "${release_name}" in
   # Mac OS X 10.4
   "tigeri386")
     XCODE_PATH="/Developer"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.4"
     ARCH="-arch i386"
     STARTUP="LaunchDaemon"
@@ -128,6 +140,7 @@ case "${release_name}" in
   # Mac OS X 10.4
   "tigerppc")
     XCODE_PATH="/Developer"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
     SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.4"
     ARCH="-arch ppc"
@@ -136,7 +149,8 @@ case "${release_name}" in
   # Mac OS X 10.3
   "panther")
     XCODE_PATH="/Developer"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.3.9.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.3.9.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.3"
     ARCH="-arch ppc"
     STARTUP="StartupItem"