Skip to content

Commit f73c9c9

Browse files
committed
auto merge of #10949 : fabricedesre/rust/no-gnustl, r=cmr
2 parents 53d1a67 + 57c6281 commit f73c9c9

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

mk/platform.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
287287
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
288288
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
289289
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
290-
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++ -lgnustl_shared
290+
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
291291
CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
292292
CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
293293
CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive

mk/tests.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
156156
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR)) \
157157
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \
158158
$(shell adb push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
159-
$(shell adb push $(CFG_ANDROID_CROSS_PATH)/arm-linux-androideabi/lib/armv7-a/libgnustl_shared.so \
160-
$(CFG_ADB_TEST_DIR) 1>/dev/null) \
161159
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(CFG_RUNTIME_arm-linux-androideabi) \
162160
$(CFG_ADB_TEST_DIR)) \
163161
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(STDLIB_GLOB_arm-linux-androideabi) \

src/libstd/rtdeps.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ extern {}
3333
#[link(name = "dl")]
3434
#[link(name = "log")]
3535
#[link(name = "supc++")]
36-
#[link(name = "gnustl_shared")]
3736
#[link(name = "m")]
3837
extern {}
3938

0 commit comments

Comments
 (0)