pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust: actually hook in the additional linker args (for powerpc).



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Thu Jul 1 09:16:58 2021 +0200
Changeset:	41b2f2cc601a44074ce0179c4adfac9b82f22cf7

Modified Files:
	rust/distinfo
	rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs

Log Message:
rust: actually hook in the additional linker args (for powerpc).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=41b2f2cc601a44074ce0179c4adfac9b82f22cf7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/distinfo                                                  |  2 +-
 .../patch-compiler_rustc__target_src_spec_netbsd__base.rs      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs:
diff --git a/rust/distinfo b/rust/distinfo
index c5354439e8..6fa3ba6f91 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -109,7 +109,7 @@ SHA1 (patch-compiler_rustc__llvm_build.rs) = b5157022f0f1942ae2db1ab78145af15267
 SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = d7cf546dc82bb851c94733b0c2dae988393503b3
 SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = efae710b37c089702802c3d5aa678d1cc5f88cc2
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 6edc875ba9ffbc1a86b30c679eb1110ba3c6c709
-SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = f6bf754e10d615781422d1fb6a689aa67c15d6fb
+SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 1aa2966bfb9cadca38da4a9724b1a5aaae66cd6e
 SHA1 (patch-compiler_rustc__target_src_spec_solaris__base.rs) = f0b41a3a5685ae33d037f8ded0b1fa6f1acb0867
 SHA1 (patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure) = 5dc1cfc843894156b513c86453db5032917a5529
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = 927b03f3f34bd21a81bd2a8b6bcf30fe241e2d32
diff --git a/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs b/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
index e9bcd7bcdd..e2e506ecb5 100644
--- a/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
+++ b/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
@@ -15,9 +15,17 @@ search the directory containing the symlinks to -latomic.
 +        LinkerFlavor::Gcc,
 +        vec![
 +            // For the benefit of powerpc, when libatomic-links is installed,
-+            "-Wl,-L@PREFIX@/lib/libatomic".to_string(),
++            "-Wl,-L/usr/pkg/lib/libatomic".to_string(),
 +        ],
 +    );
      TargetOptions {
          os: "netbsd".to_string(),
          dynamic_linking: true,
+@@ -9,6 +17,7 @@ pub fn opts() -> TargetOptions {
+         linker_is_gnu: true,
+         no_default_libraries: false,
+         has_rpath: true,
++        pre_link_args: args,
+         position_independent_executables: true,
+         relro_level: RelroLevel::Full,
+         use_ctors_section: true,


Home | Main Index | Thread Index | Old Index