mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
848d4a08a0
This patch is needed to build ghc, which adds -rpath flags for some reason. Updated patch for newest cctools and reapplied.
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
|
|
index e4b37ec..4189ebc 100644
|
|
--- a/cctools/ld64/src/ld/Options.cpp
|
|
+++ b/cctools/ld64/src/ld/Options.cpp
|
|
@@ -5800,24 +5800,6 @@ void Options::checkIllegalOptionCombinations()
|
|
if ( fDeadStrip && (fOutputKind == Options::kObjectFile) )
|
|
throw "-r and -dead_strip cannot be used together";
|
|
|
|
- // can't use -rpath unless targeting 10.5 or later
|
|
- if ( fRPaths.size() > 0 ) {
|
|
- if ( !platforms().minOS(ld::version2008) )
|
|
- 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 ( fPositionIndependentExecutable ) {
|
|
switch ( fOutputKind ) {
|
|
case Options::kDynamicExecutable:
|