Преглед изворни кода

fix ecj build

• -Bsymbolic is only for GNU ld on ELF creating DLLs,
  not for Apple ld on Mach-O creating binaries
• /usr/lib64 doesn’t exist on some OSes, I might have heard…
• indent

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Thorsten Glaser пре 13 година
родитељ
комит
7f60e6cf0e
1 измењених фајлова са 6 додато и 4 уклоњено
  1. 6 4
      jtools/ecj/Makefile

+ 6 - 4
jtools/ecj/Makefile

@@ -13,10 +13,12 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
-	env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-	PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
-	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \
-		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+	env \
+		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \
+		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar