summaryrefslogtreecommitdiff
path: root/jtools
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-01 22:15:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-01 22:15:57 +0200
commit828b812f7e09b018a6c5e2e4045029e1676c1867 (patch)
treedc579bf9aff3cdb1b185727dc09bdb6bc1115962 /jtools
parentf98e675fd2fb13847dbe2481765f96e4e3dd9e14 (diff)
now icedtea starts with compile....
Diffstat (limited to 'jtools')
-rw-r--r--jtools/classpath/Makefile4
-rw-r--r--jtools/ecj/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index 059790565..253f9604d 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -14,7 +14,7 @@ include ../rules.mk
install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
- (cd $(WRKBUILD); ./configure --prefix=/usr \
+ (cd $(WRKBUILD); ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \
--disable-local-sockets \
--disable-alsa \
--disable-gconf-peer \
@@ -31,6 +31,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
touch $@
${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
- ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install
+ ${MAKE} -C ${WRKBUILD} install
include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index 504c97350..ffa6cd43e 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -13,7 +13,9 @@ include ../rules.mk
install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
- $(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -static -O2 -m64 -Wl,-Bsymbolic -findirect-dispatch \
+ 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 \
$(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