From 6ddafd3e019c7534336d571e185879d1863f0f29 Mon Sep 17 00:00:00 2001 From: Arun Thondapu Date: Tue, 5 Jan 2016 14:30:30 +0530 Subject: Bug 383545 - Rename carbon folder into cocoa Export ARCHS="-arch x86_64" as it needs to be passed to the compiler as well as the linker Change-Id: Ibf595c272dfef30ff5510a92c5fcc7fc469ebec9 Signed-off-by: Arun Thondapu --- features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh | 1 + .../org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 3fda6e820..9176699be 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh @@ -69,6 +69,7 @@ else JAVA_HEADERS="-I$(/usr/libexec/java_home)/include -I$(/usr/libexec/java_home)/include/darwin" fi +ARCHS="-arch x86_64" export PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS ARCHS PROGRAM_OUTPUT_DIR JAVA_HEADERS if [ "$extraArgs" != "" ]; then diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak index 2f9fd1335..59a23e8d7 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak @@ -38,7 +38,7 @@ LIBS = -framework Cocoa CFLAGS = -O -s \ -Wall \ -DCOCOA -xobjective-c \ - -arch x86_64 \ + $(ARCHS) \ -DMACOSX \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -- cgit v1.2.3