Rollup merge of #71607 - RalfJung:pin-drop-panic, r=nikomatsakis

[rust.git] / src / librustc_interface / util.rs

diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
index 0797ab33827fd63e79e4b3ece79bc40a29589742..5a76802014e0d18b8bb4d1a6d53355f76a15f914 100644 (file)
--- a/src/librustc_interface/util.rs
+++ b/src/librustc_interface/util.rs
@@ -42,14 +42,17 @@
 /// features is available on the target machine, by querying LLVM.
 pub fn add_configuration(
     cfg: &mut CrateConfig,
-    sess: &Session,
+    sess: &mut Session,
     codegen_backend: &dyn CodegenBackend,
 ) {
     let tf = sym::target_feature;
 
-    cfg.extend(codegen_backend.target_features(sess).into_iter().map(|feat| (tf, Some(feat))));
+    let target_features = codegen_backend.target_features(sess);
+    sess.target_features.extend(target_features.iter().cloned());
+
+    cfg.extend(target_features.into_iter().map(|feat| (tf, Some(feat))));
 
-    if sess.crt_static_feature(None) {
+    if sess.crt_static(None) {
         cfg.insert((tf, Some(Symbol::intern("crt-static"))));
     }
 }
@@ -75,7 +78,7 @@ pub fn create_session(
     let codegen_backend = get_codegen_backend(&sess);
 
     let mut cfg = config::build_configuration(&sess, config::to_crate_config(cfg));
-    add_configuration(&mut cfg, &sess, &*codegen_backend);
+    add_configuration(&mut cfg, &mut sess, &*codegen_backend);
     sess.parse_sess.config = cfg;
 
     (Lrc::new(sess), Lrc::new(codegen_backend), source_map)