about summary refs log tree commit diff
path: root/src/test/run-make-fulldeps
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-07 17:14:46 +0000
committerbors <bors@rust-lang.org>2018-04-07 17:14:46 +0000
commit780707490f2b6c3e71a1418e08ef80a6730bce13 (patch)
tree8f481766d61262dc3835796d1d510810211f7a39 /src/test/run-make-fulldeps
parent8228d8e17649bab2881ac77c31e32ba6e341fa64 (diff)
parent48ede3f031ee81be017923708e5a6e77160e09c3 (diff)
downloadrust-780707490f2b6c3e71a1418e08ef80a6730bce13.tar.gz
rust-780707490f2b6c3e71a1418e08ef80a6730bce13.zip
Auto merge of #49672 - alexcrichton:fix-another-std-core-cycle, r=michaelwoerister
Fix another circular deps link args issue

It turns out that the support in #49316 wasn't enough to handle all cases
notably the example in #48661. The underlying bug was connected to panic=abort
where lang items were listed in the `missing_lang_items` sets but didn't
actually exist anywhere.

This caused the linker backend to deduce that start-group/end-group wasn't
needed because not all items were defined. Instead the missing lang items that
don't actually need to have a definition are filtered out and not considered for
the start-group/end-group arguments

Closes #48661
Diffstat (limited to 'src/test/run-make-fulldeps')
-rw-r--r--src/test/run-make-fulldeps/std-core-cycle/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/run-make-fulldeps/std-core-cycle/Makefile b/src/test/run-make-fulldeps/std-core-cycle/Makefile
index adc5be8016c..ce3b2d46bbc 100644
--- a/src/test/run-make-fulldeps/std-core-cycle/Makefile
+++ b/src/test/run-make-fulldeps/std-core-cycle/Makefile
@@ -13,3 +13,4 @@ endif
 all:
 	$(RUSTC) bar.rs
 	$(RUSTC) foo.rs $(FLAGS)
+	$(RUSTC) foo.rs $(FLAGS) -C panic=abort