Changes to accomodate moving to Git and to compiling on macOS 10.11

[OSXPackageBuilder.git] / common.sh

diff --git a/common.sh b/common.sh
index 74dcfdc..c78f749 100755 (executable)
--- a/common.sh
+++ b/common.sh
@@ -5,7 +5,7 @@
 # Purpose     :  Establish settings common to the build and privoxy-create
 #                scripts.
 #
-# Copyright   :  Written by and Copyright (C) 2001-2012 the
+# Copyright   :  Written by and Copyright (C) 2001-2021 the
 #                Privoxy team. http://www.privoxy.org/
 #
 #                This program is free software; you can redistribute it
@@ -47,6 +47,15 @@ release_name=$1
 # 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.11 (x86_64 only)
+  "current")
+    XCODE_PATH="`/usr/bin/xcode-select -print-path`"
+    SYSROOT="-isysroot ${XCODE_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"
+    MACOSX_VERSION="-mmacosx-version-min=10.6"
+    ARCH="-arch x86_64"
+    STARTUP="LaunchDaemon"
+    CFLAGS="-mtune=x86_64 ${CFLAGS}"
+    ;;
   # Mac OS X 10.7 (x86_64 only)
   "lion")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
@@ -233,7 +242,7 @@ case "${DIRS_FOUND}" in
        ;;
        # either both or neither found
        11|0)
-               read -p 'Could not select the Privoxy source directory. Please supply the directory name (e.g. current or dist): ' SOURCE_DIR
+               read -p 'Could not select the Privoxy source directory (it should be in a directory parallel to that containing this build script). Please supply the directory name (e.g. current or dist): ' SOURCE_DIR
        ;;
 esac
 cd OSXPackageBuilder