diff options
| author | Arun Thondapu | 2016-01-05 09:00:30 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2016-01-05 09:00:30 +0000 |
| commit | 6ddafd3e019c7534336d571e185879d1863f0f29 (patch) | |
| tree | 4d5d0d664a56c86644949c31025aefa0e1e5bb22 /features/org.eclipse.equinox.executable.feature/library | |
| parent | 5f6882c09c45ef88c14635c0d63205e752a0de77 (diff) | |
| download | rt.equinox.framework-6ddafd3e019c7534336d571e185879d1863f0f29.tar.gz rt.equinox.framework-6ddafd3e019c7534336d571e185879d1863f0f29.tar.xz rt.equinox.framework-6ddafd3e019c7534336d571e185879d1863f0f29.zip | |
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 <arunkumar.thondapu@in.ibm.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh | 1 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak | 2 |
2 files changed, 2 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 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)\"" \ |