From 45864b910a6b123659347758aea1a820675851fd Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Mon, 2 Dec 2019 16:55:44 -1000 Subject: Compile clang for appletv --- data/llvm-clang/_metadata/in.1200.00 | 0 data/llvm-clang/iphonesdkpath.diff | 46 ---------------------- data/llvm-clang/iphonesdkpath.diff.appletvos-arm64 | 46 ++++++++++++++++++++++ data/llvm-clang/iphonesdkpath.diff.iphoneos-arm | 46 ++++++++++++++++++++++ 4 files changed, 92 insertions(+), 46 deletions(-) create mode 100644 data/llvm-clang/_metadata/in.1200.00 delete mode 100644 data/llvm-clang/iphonesdkpath.diff create mode 100644 data/llvm-clang/iphonesdkpath.diff.appletvos-arm64 create mode 100644 data/llvm-clang/iphonesdkpath.diff.iphoneos-arm diff --git a/data/llvm-clang/_metadata/in.1200.00 b/data/llvm-clang/_metadata/in.1200.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/llvm-clang/iphonesdkpath.diff b/data/llvm-clang/iphonesdkpath.diff deleted file mode 100644 index ace9daa10..000000000 --- a/data/llvm-clang/iphonesdkpath.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur swift-llvm-swift-4.1.3-RELEASE/tools/clang/lib/Frontend/InitHeaderSearch.cpp swift-llvm-swift-4.1.3-RELEASE+iPhone/tools/clang/lib/Frontend/InitHeaderSearch.cpp ---- swift-llvm-swift-4.1.3-RELEASE/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2018-03-17 03:34:33.000000000 -1000 -+++ swift-llvm-swift-4.1.3-RELEASE+iPhone/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2018-09-17 12:26:55.000000000 -1000 -@@ -348,6 +348,9 @@ - } - default: - AddPath("/usr/include", ExternCSystem, false); -+ if (!HasSysroot) { -+ AddPath("/usr/share/SDKs/iPhoneOS.sdk/usr/include", ExternCSystem, false); -+ } - break; - } - } -@@ -385,11 +388,21 @@ - "arm-apple-darwin10", "v7", "", triple); - AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", - "arm-apple-darwin10", "v6", "", triple); -+ if (!HasSysroot) { -+ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/iPhoneOS.sdk/usr/include/c++/4.2.1", -+ "arm-apple-darwin10", "v7", "", triple); -+ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/iPhoneOS.sdk/usr/include/c++/4.2.1", -+ "arm-apple-darwin10", "v6", "", triple); -+ } - break; - - case llvm::Triple::aarch64: - AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", - "arm64-apple-darwin10", "", "", triple); -+ if (!HasSysroot) { -+ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/iPhoneOS.sdk/usr/include/c++/4.2.1", -+ "arm64-apple-darwin10", "", "", triple); -+ } - break; - } - return; -@@ -483,6 +496,10 @@ - // Add the default framework include paths on Darwin. - if (HSOpts.UseStandardSystemIncludes) { - if (triple.isOSDarwin()) { -+ if (!HasSysroot) { -+ AddPath("/usr/share/SDKs/iPhoneOS.sdk/System/Library/Frameworks", System, true); -+ AddPath("/usr/share/SDKs/iPhoneOS.sdk/Library/Frameworks", System, true); -+ } - AddPath("/System/Library/Frameworks", System, true); - AddPath("/Library/Frameworks", System, true); - } diff --git a/data/llvm-clang/iphonesdkpath.diff.appletvos-arm64 b/data/llvm-clang/iphonesdkpath.diff.appletvos-arm64 new file mode 100644 index 000000000..40d126ea3 --- /dev/null +++ b/data/llvm-clang/iphonesdkpath.diff.appletvos-arm64 @@ -0,0 +1,46 @@ +diff -ur swift-llvm-swift-4.1.3-RELEASE/tools/clang/lib/Frontend/InitHeaderSearch.cpp swift-llvm-swift-4.1.3-RELEASE+iPhone/tools/clang/lib/Frontend/InitHeaderSearch.cpp +--- swift-llvm-swift-4.1.3-RELEASE/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2018-03-17 03:34:33.000000000 -1000 ++++ swift-llvm-swift-4.1.3-RELEASE+iPhone/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2018-09-17 12:26:55.000000000 -1000 +@@ -348,6 +348,9 @@ + } + default: + AddPath("/usr/include", ExternCSystem, false); ++ if (!HasSysroot) { ++ AddPath("/usr/share/SDKs/AppleTVOS.sdk/usr/include", ExternCSystem, false); ++ } + break; + } + } +@@ -385,11 +388,21 @@ + "arm-apple-darwin10", "v7", "", triple); + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "arm-apple-darwin10", "v6", "", triple); ++ if (!HasSysroot) { ++ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/AppleTVOS.sdk/usr/include/c++/4.2.1", ++ "arm-apple-darwin10", "v7", "", triple); ++ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/AppleTVOS.sdk/usr/include/c++/4.2.1", ++ "arm-apple-darwin10", "v6", "", triple); ++ } + break; + + case llvm::Triple::aarch64: + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "arm64-apple-darwin10", "", "", triple); ++ if (!HasSysroot) { ++ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/AppleTVOS.sdk/usr/include/c++/4.2.1", ++ "arm64-apple-darwin10", "", "", triple); ++ } + break; + } + return; +@@ -483,6 +496,10 @@ + // Add the default framework include paths on Darwin. + if (HSOpts.UseStandardSystemIncludes) { + if (triple.isOSDarwin()) { ++ if (!HasSysroot) { ++ AddPath("/usr/share/SDKs/AppleTVOS.sdk/System/Library/Frameworks", System, true); ++ AddPath("/usr/share/SDKs/AppleTVOS.sdk/Library/Frameworks", System, true); ++ } + AddPath("/System/Library/Frameworks", System, true); + AddPath("/Library/Frameworks", System, true); + } diff --git a/data/llvm-clang/iphonesdkpath.diff.iphoneos-arm b/data/llvm-clang/iphonesdkpath.diff.iphoneos-arm new file mode 100644 index 000000000..ace9daa10 --- /dev/null +++ b/data/llvm-clang/iphonesdkpath.diff.iphoneos-arm @@ -0,0 +1,46 @@ +diff -ur swift-llvm-swift-4.1.3-RELEASE/tools/clang/lib/Frontend/InitHeaderSearch.cpp swift-llvm-swift-4.1.3-RELEASE+iPhone/tools/clang/lib/Frontend/InitHeaderSearch.cpp +--- swift-llvm-swift-4.1.3-RELEASE/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2018-03-17 03:34:33.000000000 -1000 ++++ swift-llvm-swift-4.1.3-RELEASE+iPhone/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2018-09-17 12:26:55.000000000 -1000 +@@ -348,6 +348,9 @@ + } + default: + AddPath("/usr/include", ExternCSystem, false); ++ if (!HasSysroot) { ++ AddPath("/usr/share/SDKs/iPhoneOS.sdk/usr/include", ExternCSystem, false); ++ } + break; + } + } +@@ -385,11 +388,21 @@ + "arm-apple-darwin10", "v7", "", triple); + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "arm-apple-darwin10", "v6", "", triple); ++ if (!HasSysroot) { ++ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/iPhoneOS.sdk/usr/include/c++/4.2.1", ++ "arm-apple-darwin10", "v7", "", triple); ++ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/iPhoneOS.sdk/usr/include/c++/4.2.1", ++ "arm-apple-darwin10", "v6", "", triple); ++ } + break; + + case llvm::Triple::aarch64: + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1", + "arm64-apple-darwin10", "", "", triple); ++ if (!HasSysroot) { ++ AddGnuCPlusPlusIncludePaths("/usr/share/SDKs/iPhoneOS.sdk/usr/include/c++/4.2.1", ++ "arm64-apple-darwin10", "", "", triple); ++ } + break; + } + return; +@@ -483,6 +496,10 @@ + // Add the default framework include paths on Darwin. + if (HSOpts.UseStandardSystemIncludes) { + if (triple.isOSDarwin()) { ++ if (!HasSysroot) { ++ AddPath("/usr/share/SDKs/iPhoneOS.sdk/System/Library/Frameworks", System, true); ++ AddPath("/usr/share/SDKs/iPhoneOS.sdk/Library/Frameworks", System, true); ++ } + AddPath("/System/Library/Frameworks", System, true); + AddPath("/Library/Frameworks", System, true); + } -- cgit v1.2.3