From a933526fc4526d63d92b181365b1a4f7c248611e Mon Sep 17 00:00:00 2001 From: Dave Huseby Date: Wed, 13 Jan 2016 09:32:19 -0800 Subject: [PATCH 1/2] Fixes #30873 --- mk/cfg/x86_64-unknown-bitrig.mk | 2 +- src/libstd/lib.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mk/cfg/x86_64-unknown-bitrig.mk b/mk/cfg/x86_64-unknown-bitrig.mk index dd6d19f7491bb..afffec1a53a91 100644 --- a/mk/cfg/x86_64-unknown-bitrig.mk +++ b/mk/cfg/x86_64-unknown-bitrig.mk @@ -8,7 +8,7 @@ CFG_STATIC_LIB_NAME_x86_64-unknown-bitrig=lib$(1).a CFG_LIB_GLOB_x86_64-unknown-bitrig=lib$(1)-*.so CFG_LIB_DSYM_GLOB_x86_64-unknown-bitrig=$(1)-*.dylib.dSYM CFG_JEMALLOC_CFLAGS_x86_64-unknown-bitrig := -m64 -I/usr/include $(CFLAGS) -CFG_GCCISH_CFLAGS_x86_64-unknown-bitrig := -Wall -Werror -fPIC -m64 -I/usr/include $(CFLAGS) +CFG_GCCISH_CFLAGS_x86_64-unknown-bitrig := -Wall -Werror -fPIE -fPIC -m64 -I/usr/include $(CFLAGS) CFG_GCCISH_LINK_FLAGS_x86_64-unknown-bitrig := -shared -pic -pthread -m64 $(LDFLAGS) CFG_GCCISH_DEF_FLAG_x86_64-unknown-bitrig := -Wl,--export-dynamic,--dynamic-list= CFG_LLC_FLAGS_x86_64-unknown-bitrig := diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 824acda522f3c..f1b77986b65ae 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -410,6 +410,7 @@ pub mod num; pub mod thread; pub mod collections; +#[cfg(any(target_os = "linux", target_os = "windows"))] pub mod dynamic_lib; pub mod env; pub mod ffi; From 5ecccb109410c9329d4c9924c1e357ee1e8082ff Mon Sep 17 00:00:00 2001 From: Dave Huseby Date: Wed, 13 Jan 2016 11:23:33 -0800 Subject: [PATCH 2/2] removing the conditional compilation of the dynamic_lib reference --- src/libstd/lib.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index f1b77986b65ae..824acda522f3c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -410,7 +410,6 @@ pub mod num; pub mod thread; pub mod collections; -#[cfg(any(target_os = "linux", target_os = "windows"))] pub mod dynamic_lib; pub mod env; pub mod ffi;