diff options
| author | Sam Bingner <sam@bingner.com> | 2019-12-05 13:16:37 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-12-05 13:16:37 -1000 |
| commit | 44148acdb0d90ce2ece3464f9225d48db27c7413 (patch) | |
| tree | 4cce39c30ecc7a0a4d866fd7da555522c61e9cc4 /data/ld64/searchpaths.diff | |
| parent | 30b292f444d667e767d138fa1333d67cb19e6dbb (diff) | |
Update ld64 search paths
Diffstat (limited to 'data/ld64/searchpaths.diff')
| -rw-r--r-- | data/ld64/searchpaths.diff | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/data/ld64/searchpaths.diff b/data/ld64/searchpaths.diff deleted file mode 100644 index c3d9c541b..000000000 --- a/data/ld64/searchpaths.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -ur ld64-274.2/src/ld/Options.cpp ld64-274.2+iPhone/src/ld/Options.cpp ---- ld64-274.2/src/ld/Options.cpp 2017-01-20 12:24:09.000000000 -1000 -+++ ld64-274.2+iPhone/src/ld/Options.cpp 2018-09-17 13:33:42.000000000 -1000 -@@ -3992,9 +3992,16 @@ - libraryPaths.push_back("/usr/lib"); - libraryPaths.push_back("/usr/local/lib"); - -+ // <rdar://problem/5433882> remove /Network/Library/Frameworks from default search path -+ if ( fSDKPaths.size() == 0 ) { -+ libraryPaths.push_back("/usr/share/SDKs/iPhoneOS.sdk/usr/lib"); -+ libraryPaths.push_back("/usr/share/SDKs/iPhoneOS.sdk/usr/local/lib"); -+ frameworkPaths.push_back("/usr/share/SDKs/iPhoneOS.sdk/Library/Frameworks/"); -+ frameworkPaths.push_back("/usr/share/SDKs/iPhoneOS.sdk/System/Library/Frameworks/"); -+ } -+ - frameworkPaths.push_back("/Library/Frameworks/"); - frameworkPaths.push_back("/System/Library/Frameworks/"); -- // <rdar://problem/5433882> remove /Network/Library/Frameworks from default search path - } - - // <rdar://problem/5829579> Support for configure based hacks -@@ -4051,7 +4058,7 @@ - else - fLibrarySearchPaths.push_back(libDir); - } -- else if ( !addStandardLibraryDirectories || (strcmp(libDir, "/usr/local/lib") != 0) ) { -+ else if ( !addStandardLibraryDirectories || ( (strcmp(libDir, "/usr/local/lib") != 0) && (strncmp(libDir, "/usr/share/SDKs/iPhoneOS.sdk/", 29) != 0) ) ) { - warning("directory not found for option '-L%s'", libDir); - } - } -@@ -4105,7 +4112,7 @@ - else - fFrameworkSearchPaths.push_back(frameworkDir); - } -- else if ( !addStandardLibraryDirectories || (strcmp(frameworkDir, "/Library/Frameworks/") != 0) ) { -+ else if ( !addStandardLibraryDirectories || ( (strcmp(frameworkDir, "/Library/Frameworks/") != 0) && (strncmp(frameworkDir, "/usr/share/SDKs/iPhoneOS.sdk/", 29) != 0) ) ) { - warning("directory not found for option '-F%s'", frameworkDir); - } - } |