summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2008-09-02 14:45:18 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2008-09-02 14:45:18 +0000
commit31939f51a71768d8da4222c4727d4de942a44f02 (patch)
treeb2eb207849b8c17384abbeda084363b0fe391a11 /rules
parent268117bf2b3c60e9d440e51b298622716cc4f31a (diff)
downloadOSELAS.Toolchain-31939f51a71768d8da4222c4727d4de942a44f02.tar.gz
OSELAS.Toolchain-31939f51a71768d8da4222c4727d4de942a44f02.tar.xz
* cross-gcc.make, cross-ecj.make:
don't use --with-ecj-jar switch, put jar into gcc-source dir only git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7344 f8d472c7-5700-0410-ac5a-87979cec3adf
Diffstat (limited to 'rules')
-rw-r--r--rules/cross-ecj.make4
-rw-r--r--rules/cross-gcc.make9
2 files changed, 10 insertions, 3 deletions
diff --git a/rules/cross-ecj.make b/rules/cross-ecj.make
index 7d77670..93b5ba9 100644
--- a/rules/cross-ecj.make
+++ b/rules/cross-ecj.make
@@ -28,6 +28,10 @@ CROSS_ECJ_DIR := $(CROSS_BUILDDIR)/$(CROSS_ECJ)
# Get
# ----------------------------------------------------------------------------
+ifdef PTXCONF_CROSS_ECJ
+$(STATEDIR)/cross-gcc.extract: $(STATEDIR)/cross-ecj.get
+endif
+
$(CROSS_ECJ_SOURCE):
@$(call targetinfo)
@$(call get, CROSS_ECJ)
diff --git a/rules/cross-gcc.make b/rules/cross-gcc.make
index e7743dc..8189e69 100644
--- a/rules/cross-gcc.make
+++ b/rules/cross-gcc.make
@@ -46,6 +46,9 @@ $(STATEDIR)/cross-gcc.extract:
@$(call clean, $(CROSS_GCC_DIR))
@$(call extract, CROSS_GCC, $(BUILDDIR_CROSS_DEBUG))
@$(call patchin, CROSS_GCC, $(CROSS_GCC_DIR))
+ifdef PTXCONF_CROSS_ECJ
+ @cp $(CROSS_ECJ_SOURCE) $(CROSS_GCC_DIR)/ecj.jar
+endif
@$(call touch)
# ----------------------------------------------------------------------------
@@ -123,9 +126,9 @@ CROSS_GCC_AUTOCONF := \
\
$(PTXCONF_CROSS_GCC_EXTRA_CONFIG_SHARED)
-ifdef PTXCONF_CROSS_GCC_LANG_JAVA
-CROSS_GCC_AUTOCONF += --with-ecj-jar=$(CROSS_ECJ_SOURCE)
-endif
+#ifdef PTXCONF_CROSS_GCC_LANG_JAVA
+#CROSS_GCC_AUTOCONF += --with-ecj-jar=$(CROSS_ECJ_SOURCE)
+#endif
$(STATEDIR)/cross-gcc.prepare: