Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Shanmugam2018-03-15 08:14:11 -0400
committerSravan Kumar Lakkimsetti2018-03-16 07:01:05 -0400
commit1c340db65d81fe5c155a44ff74dd0b6e1c132dac (patch)
tree2913b1dc233943fb4a9f5a09af06161358b98f0b
parente71a565208ffe2d2c6becbaef7c24159be92b6d2 (diff)
downloadrt.equinox.framework-I20180318-2000.tar.gz
rt.equinox.framework-I20180318-2000.tar.xz
rt.equinox.framework-I20180318-2000.zip
Bug 530280: Build with SDK 10.10 on the Foundation mac machine (10.12)I20180320-2000I20180319-2000I20180318-2000I20180317-1500I20180316-2000
Check if MacOSX 10.10 SDK exists at SDKROOT_PATH before exporting it. So that local build doesn't fail. Change-Id: Ifcf4fec7d2733d25c9cb983be15540ea5b513a53 Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh
index 77e04ed6c..f59aca8ec 100644
--- a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh
@@ -73,7 +73,12 @@ fi
ARCHS="-arch x86_64"
export PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS ARCHS PROGRAM_OUTPUT_DIR JAVA_HEADERS
-export MACOSX_DEPLOYMENT_TARGET=$DEPLOYMENT_TARGET SDKROOT=$SDKROOT_PATH
+export MACOSX_DEPLOYMENT_TARGET=$DEPLOYMENT_TARGET
+
+# Check if MacOSX 10.10 SDK exists at SDKROOT_PATH before exporting it.
+if [ -d $SDKROOT_PATH ]; then
+ export SDKROOT=$SDKROOT_PATH
+fi
if [ "$extraArgs" != "" ]; then
make -f $makefile $extraArgs

Back to the top