diff options
| author | Thorsten Glaser <tg@mirbsd.org> | 2011-04-02 15:49:08 +0000 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-02 17:49:52 +0200 |
| commit | d0e8617911c7b0a072c07c9da3a3a8c4ab357e0b (patch) | |
| tree | 5844a65a9e84fa3e9b9dbe5420c0342380cf6385 | |
| parent | ca1f81baa087bd0003db4d9417cef1bc849c5c5d (diff) | |
use environment for configure, make and make install
just to be sure it’s picked up correctly at all times
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
| -rw-r--r-- | jtools/gcj/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index 873e6c21c..0c29e3124 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -14,14 +14,15 @@ WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} include ../rules.mk +GCJ_ENV+= ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar +GCJ_ENV+= JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar + install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj $(WRKBUILD)/.configured: ${WRKDIST}/.prepared (cd $(WRKBUILD); \ wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \ - export ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \ - export JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \ - ./configure \ + env ${GCJ_ENV} ./configure \ --prefix=/usr \ --enable-java-home \ --enable-languages=java \ @@ -40,11 +41,12 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared touch $@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) + env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) touch $@ ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled $(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR} - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) + env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} \ + DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) include $(TOPDIR)/mk/tools.mk |