zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Make libgcc_s relocatable on Macos by adding @rpath to installname" (#3349)

Browse Source
This commit is contained in:
Adam J. Stewart 2017-03-03 21:32:44 -06:00 committed by GitHub
parent 003e841016
commit e7b019bf48
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/gcc/package.py
View File

@ -92,10 +92,6 @@ def configure_args(self):
filter_file(r"'@.*@'", "'@[[:alnum:]]*@'", 'libjava/configure', filter_file(r"'@.*@'", "'@[[:alnum:]]*@'", 'libjava/configure',
string=True) 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')) enabled_languages = set(('c', 'c++', 'fortran', 'java', 'objc'))
if spec.satisfies("@4.7.1:") and sys.platform != 'darwin' and \ if spec.satisfies("@4.7.1:") and sys.platform != 'darwin' and \
@ -176,11 +172,6 @@ def write_rpath_specs(self):
for line in lines: for line in lines:
out.write(line + "\n") out.write(line + "\n")
if line.startswith("*link:"): if line.startswith("*link:"):
if sys.platform == 'darwin': out.write("-rpath %s/lib:%s/lib64 \\\n" %
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)) (self.prefix, self.prefix))
set_install_permissions(specs_file) set_install_permissions(specs_file)