diff options
| author | bors <bors@rust-lang.org> | 2013-12-14 09:26:27 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-12-14 09:26:27 -0800 |
| commit | f73c9c9bbcaf1595f766ad8bb01e21c78fcba84b (patch) | |
| tree | d033006994b305ab98ef8d89e5a3f21824d92d60 | |
| parent | 53d1a67bbd28a756c1e00e3f92c06c7e56e247e1 (diff) | |
| parent | 57c62816492d83d1c404c10bb9c5f0e28c60c086 (diff) | |
| download | rust-f73c9c9bbcaf1595f766ad8bb01e21c78fcba84b.tar.gz rust-f73c9c9bbcaf1595f766ad8bb01e21c78fcba84b.zip | |
auto merge of #10949 : fabricedesre/rust/no-gnustl, r=cmr
| -rw-r--r-- | mk/platform.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 2 | ||||
| -rw-r--r-- | src/libstd/rtdeps.rs | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index b8694dc585c..4070ccaf270 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -287,7 +287,7 @@ CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__ CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti -CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++ -lgnustl_shared +CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++ CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list= CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive diff --git a/mk/tests.mk b/mk/tests.mk index 97c47178feb..f266a8975b4 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -156,8 +156,6 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \ $(shell adb shell mkdir $(CFG_ADB_TEST_DIR)) \ $(shell adb shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \ $(shell adb push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \ - $(shell adb push $(CFG_ANDROID_CROSS_PATH)/arm-linux-androideabi/lib/armv7-a/libgnustl_shared.so \ - $(CFG_ADB_TEST_DIR) 1>/dev/null) \ $(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(CFG_RUNTIME_arm-linux-androideabi) \ $(CFG_ADB_TEST_DIR)) \ $(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(STDLIB_GLOB_arm-linux-androideabi) \ diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs index 8c348d06734..1d13670366c 100644 --- a/src/libstd/rtdeps.rs +++ b/src/libstd/rtdeps.rs @@ -33,7 +33,6 @@ extern {} #[link(name = "dl")] #[link(name = "log")] #[link(name = "supc++")] -#[link(name = "gnustl_shared")] #[link(name = "m")] extern {} |