diff options
| author | bors <bors@rust-lang.org> | 2013-03-07 22:30:39 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-07 22:30:39 -0800 |
| commit | ceeccf8aeafbae7387c5b69743ff0ca8bfe86dd7 (patch) | |
| tree | cf8720432ba39587ebf2a4078d424b1323c87f1d | |
| parent | 88f0a105789d9d9cec4e89898109fb95238cc416 (diff) | |
| parent | cc76cb02fb444b36fc97949321c087b51b4122c4 (diff) | |
| download | rust-ceeccf8aeafbae7387c5b69743ff0ca8bfe86dd7.tar.gz rust-ceeccf8aeafbae7387c5b69743ff0ca8bfe86dd7.zip | |
auto merge of #5281 : ILyoan/rust/master, r=brson
This fixes a problem on compiling test suits for android target.
| -rw-r--r-- | mk/platform.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 55d5a3c476e..47dd3cbcdc7 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -239,7 +239,7 @@ CFG_PATH_MUNGE_arm-unknown-android := true CFG_LDPATH_arm-unknown-android := CFG_RUN_arm-unknown-android= CFG_RUN_TARG_arm-unknown-android= -RUSTC_FLAGS_arm-unknown-android :=--android-cross-path='$(CFG_ANDROID_CROSS_PATH)' +RUSTC_FLAGS_arm-unknown-android :=--android-cross-path=$(CFG_ANDROID_CROSS_PATH) # i686-pc-mingw32 configuration CC_i686-pc-mingw32=$(CC) diff --git a/mk/tests.mk b/mk/tests.mk index c1852f52724..549741ddd65 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -408,7 +408,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \ --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ --aux-base $$(S)src/test/auxiliary/ \ --stage-id stage$(1)-$(2) \ - --rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)" \ + --rustcflags "$(RUSTC_FLAGS_$(2)) $$(CFG_RUSTC_FLAGS) --target=$(2)" \ $$(CTEST_TESTARGS) CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS) |