diff options
| author | Lakshmi Shanmugam | 2021-04-09 10:59:25 +0000 |
|---|---|---|
| committer | Thomas Watson | 2021-04-09 20:40:21 +0000 |
| commit | cac3c053daf09bf187df59691fc8eff3168327c4 (patch) | |
| tree | 7e3e9cd3e11eca3b4322632496cdf579c8dc2faf | |
| parent | fb9784e6810b3d47444af881ba0ce8503ac25b37 (diff) | |
| download | rt.equinox.framework-cac3c053daf09bf187df59691fc8eff3168327c4.tar.gz rt.equinox.framework-cac3c053daf09bf187df59691fc8eff3168327c4.tar.xz rt.equinox.framework-cac3c053daf09bf187df59691fc8eff3168327c4.zip | |
Bug 572115 - Eclipse Mac arm64 fails to launch
On Mac arm64, using -pagezero_size 0x1000 flag at linking causes
Malformed Mach-O file. Don't use it for arm64 builds.
Change-Id: I95438825a22f95bc55dcef9247c2e289a4e9b7d3
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak | 8 |
1 files changed, 6 insertions, 2 deletions
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 fe34bee2f..6d0f6a8c0 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 @@ -37,6 +37,10 @@ EXEC = $(PROGRAM_OUTPUT) DLL = $(PROGRAM_LIBRARY) LIBS = -framework Cocoa +ifeq ($(ARCHS),-arch x86_64) + LDFLAGS=-pagezero_size 0x1000 +endif + CFLAGS = -O -s \ -Wall \ -DCOCOA -xobjective-c \ @@ -74,7 +78,7 @@ eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c $(CC) $(CFLAGS) -c ../eclipseShm.c -o $@ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) - $(CC) -pagezero_size 0x1000 -o $(EXEC) $(ARCHS) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) + $(CC) $(LDFLAGS) -o $(EXEC) $(ARCHS) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) -bundle -o $(DLL) $(ARCHS) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) @@ -84,4 +88,4 @@ install: all rm -f $(EXEC) $(OBJS) clean: - rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) + rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
\ No newline at end of file |