summaryrefslogtreecommitdiffstats
path: root/jack-tests/build
diff options
context:
space:
mode:
authormikaelpeltier <mikaelpeltier@google.com>2014-07-29 11:00:47 +0200
committermikaelpeltier <mikaelpeltier@google.com>2014-07-29 11:00:47 +0200
commitb3a1996a72139ba3770fce388b7235849884ed83 (patch)
tree20edf13eea5add2ec73fe3ceb40cc0c6bcac5b7b /jack-tests/build
parentafbb5afe2b90ea0e56e663d341d72083ad5a9181 (diff)
downloadtoolchain_jack-b3a1996a72139ba3770fce388b7235849884ed83.zip
toolchain_jack-b3a1996a72139ba3770fce388b7235849884ed83.tar.gz
toolchain_jack-b3a1996a72139ba3770fce388b7235849884ed83.tar.bz2
-o option is no longer a file but a folder
Change-Id: I46702a101e0d42015943e34e91008cd9a18331c6
Diffstat (limited to 'jack-tests/build')
-rw-r--r--jack-tests/build/run-test.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/jack-tests/build/run-test.mk b/jack-tests/build/run-test.mk
index 540009e..e49b8f7 100644
--- a/jack-tests/build/run-test.mk
+++ b/jack-tests/build/run-test.mk
@@ -102,7 +102,7 @@ $(JACKTEST_LINK_DEX): PRIVATE_JAVA_SOURCES := $(JACKTEST_LINK_SRC)
$(JACKTEST_LINK_DEX): PRIVATE_ARGS := $(JACKTEST_ARGS) $(JACKTEST_SOURCE_JAVA7)
$(JACKTEST_LINK_DEX): $(JACKTEST_LINK_SRC) $(PRIVATE_TEST_MK) $(BOOTCLASSPATH_LIBS) $(JACK_JAR)
$(hide) mkdir -p $(dir $@)
- $(hide) $(JACK) $(PRIVATE_ARGS) $(PRIVATE_BOOTCLASSPATH) $(addprefix -cp ,$(PRIVATE_CLASSPATH)) -o $@ --ecj -nowarn \
+ $(hide) $(JACK) $(PRIVATE_ARGS) $(PRIVATE_BOOTCLASSPATH) $(addprefix -cp ,$(PRIVATE_CLASSPATH)) -o $(dir $@) --ecj -nowarn \
$(PRIVATE_JAVA_SOURCES)
$(JACKTEST_WITHJACK_DEX): PRIVATE_BOOTCLASSPATH := $(local_bootclasspath_jack)
@@ -111,7 +111,7 @@ $(JACKTEST_WITHJACK_DEX): PRIVATE_JAVA_SOURCES := $(JACKTEST_WITHJACK_SRC)
$(JACKTEST_WITHJACK_DEX): PRIVATE_ARGS := $(JACKTEST_ARGS) $(JACKTEST_SOURCE_JAVA7)
$(JACKTEST_WITHJACK_DEX): $(JACKTEST_WITHJACK_SRC) $(BOOTCLASSPATH_LIBS) $(PRIVATE_TEST_MK) $(JACKTEST_LIB_JAR) $(JACK_JAR)
$(hide) mkdir -p $(dir $@)
- $(hide) $(JACK) $(PRIVATE_ARGS) -o $@ $(PRIVATE_BOOTCLASSPATH) $(addprefix -cp ,$(PRIVATE_CLASSPATH)) --ecj -nowarn \
+ $(hide) $(JACK) $(PRIVATE_ARGS) -o $(dir $@) $(PRIVATE_BOOTCLASSPATH) $(addprefix -cp ,$(PRIVATE_CLASSPATH)) --ecj -nowarn \
$(PRIVATE_JAVA_SOURCES)
$(JACKTEST_WITHDX_JAR): PRIVATE_JACK_DEBUG_FLAGS := -g