diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-03-03 21:32:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 21:32:44 -0600 |
| commit | e7b019bf48922225da2f523d1475a780cf6050a5 (patch) | |
| tree | 6c507938f49fc1a8bd793b6c61b22342412fd409 /var | |
| parent | 003e841016fdb0a0ddc1334cc519ea62b1c9d392 (diff) | |
| download | spack-e7b019bf48922225da2f523d1475a780cf6050a5.tar.gz spack-e7b019bf48922225da2f523d1475a780cf6050a5.tar.bz2 spack-e7b019bf48922225da2f523d1475a780cf6050a5.tar.xz spack-e7b019bf48922225da2f523d1475a780cf6050a5.zip | |
Revert "Make libgcc_s relocatable on Macos by adding @rpath to installname" (#3349)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gcc/package.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index c005cd581a..a9fed4d8dd 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -92,10 +92,6 @@ class Gcc(AutotoolsPackage): filter_file(r"'@.*@'", "'@[[:alnum:]]*@'", 'libjava/configure', string=True) - # Make libgcc_s relocatable - filter_file(r"@shlib_slibdir@", "@rpath", - 'libgcc/config/t-slibgcc-darwin', string=True) - enabled_languages = set(('c', 'c++', 'fortran', 'java', 'objc')) if spec.satisfies("@4.7.1:") and sys.platform != 'darwin' and \ @@ -176,11 +172,6 @@ class Gcc(AutotoolsPackage): for line in lines: out.write(line + "\n") if line.startswith("*link:"): - if sys.platform == 'darwin': - out.write("-rpath %s/lib -rpath %s/lib64 " - r"-headerpad_max_install_names \n" % - (self.prefix, self.prefix)) - else: - out.write(r"-rpath %s/lib:%s/lib64 \n" % - (self.prefix, self.prefix)) + out.write("-rpath %s/lib:%s/lib64 \\\n" % + (self.prefix, self.prefix)) set_install_permissions(specs_file) |