Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Shanmugam2021-01-14 15:44:39 +0000
committerLakshmi Shanmugam2021-01-14 15:45:25 +0000
commit7fad7e445c60c8f2677ee45fc49b6d783de185c0 (patch)
tree2e979769973eff75b9ce24a6a33205ba6bfe4a77
parent324e5b08427b170c5c2ef361689873920dc3832f (diff)
downloadeclipse.platform.swt-7fad7e445c60c8f2677ee45fc49b6d783de185c0.tar.gz
eclipse.platform.swt-7fad7e445c60c8f2677ee45fc49b6d783de185c0.tar.xz
eclipse.platform.swt-7fad7e445c60c8f2677ee45fc49b6d783de185c0.zip
Check MODEL for arm64 and x86_64 in build.sh
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh23
1 files changed, 15 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
index ba8de7a900..2b3114e29b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/build.sh
@@ -21,14 +21,21 @@ else
export CFLAGS_JAVA_VM="-I $(/usr/libexec/java_home)/include -I $(/usr/libexec/java_home)/include/darwin"
fi
-export ARCHS="-arch x86_64 -arch arm64"
-if [ "x${OUTPUT_DIR}" = "x" ]; then
- export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.x86_64
-fi
-if [ -d "chromium_subp/cef_macosx" ]; then
- export CHROMIUM_HEADERS=./chromium_subp/cef_macosx
-else
- export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_macosx
+if [ "x${MODEL}" = "xx86_64" ]; then
+ export ARCHS="-arch x86_64"
+ if [ "x${OUTPUT_DIR}" = "x" ]; then
+ export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.x86_64
+ fi
+ if [ -d "chromium_subp/cef_macosx" ]; then
+ export CHROMIUM_HEADERS=./chromium_subp/cef_macosx
+ else
+ export CHROMIUM_HEADERS=$CHROMIUM_OUTPUT_DIR/../../../../eclipse.platform.swt/bundles/org.eclipse.swt.browser.chromium/common/rust-library/chromium_subp/cef_macosx
+ fi
+elif [ "x${MODEL}" = "xarm64" ]; then
+ export ARCHS="-arch arm64"
+ if [ "x${OUTPUT_DIR}" = "x" ]; then
+ export OUTPUT_DIR=../../../org.eclipse.swt.cocoa.macosx.arm64
+ fi
fi
export MACOSX_DEPLOYMENT_TARGET=10.10

Back to the top