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 | |
| parent | 30b292f444d667e767d138fa1333d67cb19e6dbb (diff) | |
Update ld64 search paths
| -rw-r--r-- | data/ld64/searchpaths.diff.appletvos-arm64 | 39 | ||||
| -rw-r--r-- | data/ld64/searchpaths.diff.iphoneos-arm (renamed from data/ld64/searchpaths.diff) | 0 |
2 files changed, 39 insertions, 0 deletions
diff --git a/data/ld64/searchpaths.diff.appletvos-arm64 b/data/ld64/searchpaths.diff.appletvos-arm64 new file mode 100644 index 000000000..e40a0a1fd --- /dev/null +++ b/data/ld64/searchpaths.diff.appletvos-arm64 @@ -0,0 +1,39 @@ +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/AppleTVOS.sdk/usr/lib"); ++ libraryPaths.push_back("/usr/share/SDKs/AppleTVOS.sdk/usr/local/lib"); ++ frameworkPaths.push_back("/usr/share/SDKs/AppleTVOS.sdk/Library/Frameworks/"); ++ frameworkPaths.push_back("/usr/share/SDKs/AppleTVOS.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/AppleTVOS.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/AppleTVOS.sdk/", 29) != 0) ) ) { + warning("directory not found for option '-F%s'", frameworkDir); + } + } diff --git a/data/ld64/searchpaths.diff b/data/ld64/searchpaths.diff.iphoneos-arm index c3d9c541b..c3d9c541b 100644 --- a/data/ld64/searchpaths.diff +++ b/data/ld64/searchpaths.diff.iphoneos-arm |