diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-20 14:11:53 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-07-20 14:11:53 +0200 |
commit | 1e0971c3dd8bb303176f058bcd53682de9241616 (patch) | |
tree | 15f992eb6183156389839f6a48ce09b96a7a62c2 /solenv | |
parent | 37c67a137882cc1a9e113552dcab42a7d6337358 (diff) |
Support for --with-java-target-version in gbuild
...had been missing. Old dmake-based build system did not add -source/-target
when using gcj (unless gcj really was Eclipse Java Compiler, in which case those
-source/-target values were tunneled in via JAVAFLAGS)---hopefully all this is
no longer necessary.
(Also removed a single use of JAVA_TARGET_FLAG that was nowhere defined.)
Change-Id: Ic3596691b622be45e151333981f8f236d11825b4
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 3 | ||||
-rw-r--r-- | solenv/inc/settings.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 2338f32ed8af..719833108f42 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,8 @@ # #************************************************************************* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) \ + -source $(JAVA_SOURCE_VER) -target $(JAVA_TARGET_VER) gb_JavaClassSet_JAVACDEBUG := # Enforces correct dependency order for possibly generated stuff: diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 9d01c5eff57d..36234fcc7735 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -133,8 +133,6 @@ JAVARESPONSE= .ENDIF .ENDIF -JAVAFLAGS+=$(JAVA_TARGET_FLAG) - #END JAVA CDEFS= |