diff options
| author | John Hodge <tpg@mutabah.net> | 2017-01-26 23:11:56 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2017-01-26 23:11:56 +0800 |
| commit | 4de0619c19a49318b689fe8314095f85c6e0b2c1 (patch) | |
| tree | acff07e7812a19acb64f3c44110c169cea7ed5db | |
| parent | 6cfc0268fd82bd6e4fd8a91ae02e35d6d6f414df (diff) | |
| download | mrust-4de0619c19a49318b689fe8314095f85c6e0b2c1.tar.gz | |
Makefile - Tweak for rust_os
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -263,6 +263,8 @@ rust_tests: rust_tests-run-pass rust_tests-run-fail # - Require external symbols that aren't generated. DISABLED_TESTS = run-pass/abi-sysv64-arg-passing run-pass/abi-sysv64-register-usage run-pass/anon-extern-mod run-pass/anon-extern-mod-cross-crate-2 +# - NOT A TEST +DISABLED_TESTS += run-pass/backtrace-debuginfo-aux # - asm! is hard to trnaslate DISABLED_TESTS += run-pass/asm-in-out-operand run-pass/asm-indirect-memory run-pass/asm-out-assign # - Requires jemalloc @@ -270,7 +272,8 @@ DISABLED_TESTS += run-pass/allocator-default run-pass/allocator-override # - Bug in inferrence order. DISABLED_TESTS += run-pass/associated-types-conditional-dispatch # - Lazy. -DISABLED_TESTS += run-pass/associated-types-projection-in-where-clause +DISABLED_TESTS += run-pass/associated-types-projection-in-where-clause run-pass/autoderef-privacy + DEF_RUST_TESTS = $(sort $(patsubst $(RUST_TESTS_DIR)%.rs,output/rust/%_out.txt,$(wildcard $(RUST_TESTS_DIR)$1/*.rs))) rust_tests-run-pass: $(filter-out $(patsubst %,output/rust/%_out.txt,$(DISABLED_TESTS)), $(call DEF_RUST_TESTS,run-pass)) rust_tests-run-fail: $(call DEF_RUST_TESTS,run-fail) @@ -333,7 +336,7 @@ RUSTOS_ENV += TK_BUILD="mrustc:0" output/rust_os/libkernel.hir: ../rust_os/Kernel/Core/main.rs output/libcore.hir output/libstack_dst.hir $(BIN) @mkdir -p $(dir $@) - $(RUSTOS_ENV) $(DBG) $(BIN) $< -o $@ --cfg arch=amd64 $(PIPECMD) + export $(RUSTOS_ENV) ; $(DBG) $(BIN) $< -o $@ --cfg arch=amd64 $(PIPECMD) output/libstack_dst.hir: ../rust_os/externals/crates.io/stack_dst/src/lib.rs $(BIN) @mkdir -p $(dir $@) $(DBG) $(BIN) $< -o $@ --cfg feature=no_std $(PIPECMD) |