From e9a2b2ca11b57e7a051087c5c14b3d89cb942e1e Mon Sep 17 00:00:00 2001 From: Lokathor Date: Fri, 6 Sep 2019 11:37:00 -0600 Subject: [PATCH 1/5] i was told to change this path to my repo and reset things --- library/compiler-builtins/.gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/compiler-builtins/.gitmodules b/library/compiler-builtins/.gitmodules index a71118ff93e7..23d29e11b4da 100644 --- a/library/compiler-builtins/.gitmodules +++ b/library/compiler-builtins/.gitmodules @@ -1,3 +1,3 @@ [submodule "libm"] path = libm - url = https://github.com/rust-lang-nursery/libm + url = https://github.com/Lokathor/libm From 3ab350613b44869e1f3e5c7a594609f9fb7e1f1b Mon Sep 17 00:00:00 2001 From: Lokathor Date: Fri, 6 Sep 2019 13:48:15 -0600 Subject: [PATCH 2/5] Update the libm submodule --- library/compiler-builtins/libm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/compiler-builtins/libm b/library/compiler-builtins/libm index 01bee72a93eb..52983bee338a 160000 --- a/library/compiler-builtins/libm +++ b/library/compiler-builtins/libm @@ -1 +1 @@ -Subproject commit 01bee72a93ebaeea2883d0f963174c2b00d4fe68 +Subproject commit 52983bee338ac439bc0f1146d6053955e3b4c33a From e079f2d70d5813775bff2e23ed942f76474c1e0e Mon Sep 17 00:00:00 2001 From: Lokathor Date: Fri, 6 Sep 2019 15:20:05 -0600 Subject: [PATCH 3/5] Update build.rs --- library/compiler-builtins/build.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs index 490b6391d08e..5cdabf95987e 100644 --- a/library/compiler-builtins/build.rs +++ b/library/compiler-builtins/build.rs @@ -8,6 +8,9 @@ fn main() { println!("cargo:compiler-rt={}", cwd.join("compiler-rt").display()); + // Activate libm's unstable features to make full use of Nightly. + println!("rustc-cfg=libm/unstable"); + // Emscripten's runtime includes all the builtins if target.contains("emscripten") { return; From e796054f9ee7722a9b473de8de737a443bbd1112 Mon Sep 17 00:00:00 2001 From: Lokathor Date: Fri, 6 Sep 2019 18:02:11 -0600 Subject: [PATCH 4/5] Update build.rs --- library/compiler-builtins/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs index 5cdabf95987e..b520b62477ed 100644 --- a/library/compiler-builtins/build.rs +++ b/library/compiler-builtins/build.rs @@ -9,7 +9,7 @@ fn main() { println!("cargo:compiler-rt={}", cwd.join("compiler-rt").display()); // Activate libm's unstable features to make full use of Nightly. - println!("rustc-cfg=libm/unstable"); + println!("cargo:rustc-cfg=feature=\"unstable\""); // Emscripten's runtime includes all the builtins if target.contains("emscripten") { From b86b2d59bc2f9141bbb71ec029677c5f9af321e0 Mon Sep 17 00:00:00 2001 From: Lokathor Date: Mon, 9 Sep 2019 19:43:37 -0600 Subject: [PATCH 5/5] update the libm submodule, again --- library/compiler-builtins/.gitmodules | 2 +- library/compiler-builtins/libm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/compiler-builtins/.gitmodules b/library/compiler-builtins/.gitmodules index 23d29e11b4da..a71118ff93e7 100644 --- a/library/compiler-builtins/.gitmodules +++ b/library/compiler-builtins/.gitmodules @@ -1,3 +1,3 @@ [submodule "libm"] path = libm - url = https://github.com/Lokathor/libm + url = https://github.com/rust-lang-nursery/libm diff --git a/library/compiler-builtins/libm b/library/compiler-builtins/libm index 52983bee338a..8eedc2470531 160000 --- a/library/compiler-builtins/libm +++ b/library/compiler-builtins/libm @@ -1 +1 @@ -Subproject commit 52983bee338ac439bc0f1146d6053955e3b4c33a +Subproject commit 8eedc2470531f51b978e4c873ee78a33c90e0fbd