auto merge of #10949 : fabricedesre/rust/no-gnustl, r=cmr

rust-lang · Dec 14, 2013 · f73c9c9 · f73c9c9
2 parents 53d1a67 + 57c6281
commit f73c9c9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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
@@ -33,7 +33,6 @@ extern {}
 #[link(name = "dl")]
 #[link(name = "log")]
 #[link(name = "supc++")]
-#[link(name = "gnustl_shared")]
 #[link(name = "m")]
 extern {}