Fix used_linker feature (#310)

Reported in #309 -- feature logic was wrong.
mmastrac · Nov 20, 2024 · 16f0898 · 16f0898
1 parent fc9cd68
commit 16f0898
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ctor/Cargo.toml b/ctor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ctor"
-version = "0.2.8"
+version = "0.2.9"
 authors = ["Matt Mastracci <matthew@mastracci.com>"]
 edition = "2018"
 description = "__attribute__((constructor)) for Rust"

diff --git a/ctor/src/lib.rs b/ctor/src/lib.rs
@@ -170,15 +170,21 @@ pub fn ctor(_attribute: TokenStream, function: TokenStream) -> TokenStream {
                 .expect("Unable to create identifier");
 
         let tokens = ctor_attributes!();
+
+        let used = if cfg!(feature = "used_linker") {
+            quote!(#[used(linker)])
+        } else {
+            quote!(#[used])
+        };
+
         let output = quote!(
             #[cfg(not(any(target_os = "linux", target_os = "android", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd", target_os = "dragonfly", target_os = "illumos", target_os = "haiku", target_vendor = "apple", windows)))]
             compile_error!("#[ctor] is not supported on the current target");
 
             #(#attrs)*
             #vis #unsafety extern #abi #constness fn #ident() #block
 
-            #[cfg_attr(not(feature = "used_linker"), used)]
-            #[cfg_attr(feature = "used_linker", used(linker))]
+            #used
             #[allow(non_upper_case_globals, non_snake_case)]
             #[doc(hidden)]
             #tokens