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
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 fe34bee..6d0f6a8 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 @@
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 @@
$(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 @@
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
