diff options
| author | John Hodge <tpg@mutabah.net> | 2018-06-03 12:43:55 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2018-06-03 12:43:55 +0800 |
| commit | b635b94597796728194de0f8d2619f2c1f5ee542 (patch) | |
| tree | 8e9ebd13c6ba2962c1f4bbc3108411b925090459 | |
| parent | fb12fdc738c4066acd46069bbd5f1161c907b295 (diff) | |
| download | mrust-b635b94597796728194de0f8d2619f2c1f5ee542.tar.gz | |
Build scripts - macos support
9 files changed, 13 insertions, 1 deletions
diff --git a/minicargo.mk b/minicargo.mk index db19eab9..aee2483a 100644 --- a/minicargo.mk +++ b/minicargo.mk @@ -6,7 +6,12 @@ OUTDIR_SUF ?= MMIR ?= RUSTC_CHANNEL ?= stable RUSTC_VERSION ?= 1.19.0 +ifeq ($(OS),Windows_NT) +else ifeq ($(shell uname -s || echo not),Darwin) +OVERRIDE_SUFFIX ?= -macos +else OVERRIDE_SUFFIX ?= -linux +endif PARLEVEL ?= 1 MINICARGO_FLAGS ?= diff --git a/script-overrides/stable-1.19.0-linux/build_std.txt b/script-overrides/stable-1.19.0-linux/build_std.txt index 121e2825..e88dd227 100644 --- a/script-overrides/stable-1.19.0-linux/build_std.txt +++ b/script-overrides/stable-1.19.0-linux/build_std.txt @@ -1,4 +1,4 @@ -# TODO: THis is the windows set +# TODO: Build libbacktrace cargo:rustc-link-lib=dl cargo:rustc-link-lib=rt cargo:rustc-link-lib=pthread diff --git a/script-overrides/stable-1.19.0-macos/build_compiler_builtins.txt b/script-overrides/stable-1.19.0-macos/build_compiler_builtins.txt new file mode 100644 index 00000000..06ae3dbf --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_compiler_builtins.txt @@ -0,0 +1 @@ +# NOTE: mrustc doesn't need this built fully
\ No newline at end of file diff --git a/script-overrides/stable-1.19.0-macos/build_rustc_asan.txt b/script-overrides/stable-1.19.0-macos/build_rustc_asan.txt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_rustc_asan.txt diff --git a/script-overrides/stable-1.19.0-macos/build_rustc_lsan.txt b/script-overrides/stable-1.19.0-macos/build_rustc_lsan.txt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_rustc_lsan.txt diff --git a/script-overrides/stable-1.19.0-macos/build_rustc_msan.txt b/script-overrides/stable-1.19.0-macos/build_rustc_msan.txt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_rustc_msan.txt diff --git a/script-overrides/stable-1.19.0-macos/build_rustc_tsan.txt b/script-overrides/stable-1.19.0-macos/build_rustc_tsan.txt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_rustc_tsan.txt diff --git a/script-overrides/stable-1.19.0-macos/build_std.txt b/script-overrides/stable-1.19.0-macos/build_std.txt new file mode 100644 index 00000000..45d767ae --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_std.txt @@ -0,0 +1,5 @@ +cargo:rustc-link-lib=System +# res_init and friends require -lresolv on macOS/iOS. +# See #41582 and http://blog.achernya.com/2013/03/os-x-has-silly-libsystem.html +cargo:rustc-link-lib=resolv + diff --git a/script-overrides/stable-1.19.0-macos/build_unwind.txt b/script-overrides/stable-1.19.0-macos/build_unwind.txt new file mode 100644 index 00000000..8f49a16c --- /dev/null +++ b/script-overrides/stable-1.19.0-macos/build_unwind.txt @@ -0,0 +1 @@ +# Nothing to do on macos |