diff options
| author | John Hodge <tpg@mutabah.net> | 2018-12-29 20:02:05 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2018-12-29 20:02:05 +0800 |
| commit | 73261b9520fb7c3003b435fbc5f28613b4aff390 (patch) | |
| tree | e9a948c400e06c23094841bd70f75a6177f5a709 | |
| parent | 4ed6aa06c15bf4d96f855c2508c0bed545b5b06b (diff) | |
| download | mrust-73261b9520fb7c3003b435fbc5f28613b4aff390.tar.gz | |
Misc - Fix script overrides for std (was using windows), remove absent test helper
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | script-overrides/stable-1.29.0-linux/build_std.txt | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -153,7 +153,10 @@ output/libtest.hir output/libpanic_unwind.hir output/libproc_macro.hir: output/l output/rustc output/cargo: output/libtest.hir $(MAKE_MINICARGO) $@ -TEST_DEPS := output/libstd.hir output/libtest.hir output/libpanic_unwind.hir output/librust_test_helpers.a +TEST_DEPS := output/libstd.hir output/libtest.hir output/libpanic_unwind.hir +ifeq ($(RUSTC_VERSION),1.19.0) +TEST_DEPS += output/librust_test_helpers.a +endif fcn_extcrate = $(patsubst %,output/lib%.hir,$(1)) diff --git a/script-overrides/stable-1.29.0-linux/build_std.txt b/script-overrides/stable-1.29.0-linux/build_std.txt index 062afd95..e88dd227 100644 --- a/script-overrides/stable-1.29.0-linux/build_std.txt +++ b/script-overrides/stable-1.29.0-linux/build_std.txt @@ -1,5 +1,5 @@ -# TODO: THis is the windows set -cargo:rustc-link-lib=advapi32 -cargo:rustc-link-lib=ws2_32 -cargo:rustc-link-lib=userenv -cargo:rustc-link-lib=shell32
\ No newline at end of file +# TODO: Build libbacktrace +cargo:rustc-link-lib=dl +cargo:rustc-link-lib=rt +cargo:rustc-link-lib=pthread + |