diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-02-03 14:06:13 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-03 14:06:13 -0800 |
| commit | ebb8d03f96e3f1bf8491a3f74540d2cbb47da294 (patch) | |
| tree | 57f530f3c32b8329b91340ad903d5d2ecf40ef5e /pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch | |
| parent | 92188d9d1751892ddbf8913da73dfc150d18fadb (diff) | |
| download | nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.tar nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.tar.gz nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.tar.bz2 nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.tar.lz nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.tar.xz nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.tar.zst nixpkgs-ebb8d03f96e3f1bf8491a3f74540d2cbb47da294.zip | |
darwin-specific stuff
Diffstat (limited to 'pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch')
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch b/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch new file mode 100644 index 00000000000..265d0d30477 --- /dev/null +++ b/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch @@ -0,0 +1,31 @@ +diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp +index 9250016..91d54ec 100644 +--- a/cctools/ld64/src/ld/Options.cpp ++++ b/cctools/ld64/src/ld/Options.cpp +@@ -4175,23 +4175,9 @@ void Options::checkIllegalOptionCombinations() + throw "-r and -dead_strip cannot be used together"; + + // can't use -rpath unless targeting 10.5 or later +- if ( fRPaths.size() > 0 ) { +- if ( !minOS(ld::mac10_5, ld::iOS_2_0) ) +- throw "-rpath can only be used when targeting Mac OS X 10.5 or later"; +- switch ( fOutputKind ) { +- case Options::kDynamicExecutable: +- case Options::kDynamicLibrary: +- case Options::kDynamicBundle: +- break; +- case Options::kStaticExecutable: +- case Options::kObjectFile: +- case Options::kDyld: +- case Options::kPreload: +- case Options::kKextBundle: +- throw "-rpath can only be used when creating a dynamic final linked image"; +- } +- } +- ++ if ( fRPaths.size() > 0 && !minOS(ld::mac10_5, ld::iOS_2_0) ) ++ throw "-rpath can only be used when targeting Mac OS X 10.5 or later"; ++ + if ( fPositionIndependentExecutable ) { + switch ( fOutputKind ) { + case Options::kDynamicExecutable: |