From 8be2f017e74fbbf6eb1c8db5477c57355aff960a Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 27 Apr 2023 15:52:28 +0200 Subject: gcc: no need to special case macos/linux wrt rpaths (#37243) --- var/spack/repos/builtin/packages/gcc/package.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 6270c9c47a..18e0fe1c04 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -968,12 +968,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage): # Add easily-overridable rpath string at the end out.write("*link_libgcc_rpath:\n") - if "platform=darwin" in self.spec: - # macOS linker requires separate rpath commands - out.write(" ".join("-rpath " + lib for lib in rpath_libdirs)) - else: - # linux linker uses colon-separated rpath - out.write("-rpath " + ":".join(rpath_libdirs)) + out.write(" ".join("-rpath " + lib for lib in rpath_libdirs)) out.write("\n") set_install_permissions(specs_file) tty.info("Wrote new spec file to {0}".format(specs_file)) -- cgit v1.2.3-60-g2f50