summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-07-22 10:31:22 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-07-22 10:31:22 +0300
commitfa07a2b41563184bbca4a7f0b061193031f87bac (patch)
tree9d3c5b822c919f5aecfca4305c9f5ba4f7c8f6dc
parent47b4ee01c88a58399ce510b68734072cf6d07bdb (diff)
Use correct solar.jar when cross-compiling
-rw-r--r--solenv/inc/antsettings.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index fda4a8289..0137e33b6 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -82,7 +82,7 @@ JAVA_HOME=
ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_VER_FLAGS) \
-Ddebug=$(ANT_DEBUG) -Doptimize=$(ANT_OPT) -Dtarget=$(TARGET) -Dsolar.update=on \
-Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
- -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
+ -Dsolar.jar=$(SOLARVER)/$(INPATH)/bin -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
-Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
-Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
-emacs $(ANT_VERBOSE)