diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-07-27 15:37:34 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-07-27 15:37:34 +0000 |
| commit | 576108f93e655ea83b09f28ab9307d99f4127a10 (patch) | |
| tree | 9501a9d813f0a6c06c53f3516bfe6e96e9ae4f37 | |
| parent | d19bc258745eadadcad3220c4fd2f6eb319be511 (diff) | |
| parent | a2d91ed512d248d832e385c40db6f31d0886dabe (diff) | |
merge of '77bc506750c82f6a414e7c64c175cdaa3dd4b0d5'
and '7d59915b6a6897fd24467fd539404f8354fe0fa9'
| -rw-r--r-- | packages/classpath/classpath-native.inc | 4 | ||||
| -rw-r--r-- | packages/classpath/classpath.inc | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc index 310ca3c3af..bb5abaf178 100644 --- a/packages/classpath/classpath-native.inc +++ b/packages/classpath/classpath-native.inc @@ -10,10 +10,6 @@ DEPENDS = "ecj-initial fastjar-native zip-native" inherit autotools native -# Newer versions expect setting the compiler through this -# environment variable. -export JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial - EXTRA_OECONF = "\ --with-glibj \ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \ diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 0ea5d36f33..cfb9f1c089 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -20,13 +20,9 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" S = "${WORKDIR}/${PBN}-${PV}" -# Newer versions expect setting the compiler through this -# environment variable. -export JAVAC=${STAGING_BINDIR_NATIVE}/javac - EXTRA_OECONF = "\ --with-glibj \ - --with-ecj=${STAGING_BINDIR_NATIVE}/javac \ + --with-ecj=javac \ --with-fastjar=fastjar \ --includedir=${includedir}/classpath \ --with-vm=java \ |