averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixup header symlink issue due to clang 3.8 assumption

Browse Source 
The master-next branch brought in clang 4.0 in a recent merge.
Fix the CI that is breaking when trying to link in the 3.8-specific
headers.
This commit is contained in:
Todd Fiala
2016-10-18 15:41:11 -07:00
parent 1caba3e209
commit 7213a4d825
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/build-script
View File

@@ -1933,7 +1933,7 @@ iterations with -O",
"--clang-user-visible-version", "--clang-user-visible-version",
help="User-visible version of the embedded Clang and LLVM compilers", help="User-visible version of the embedded Clang and LLVM compilers",
type=arguments.type.clang_compiler_version, type=arguments.type.clang_compiler_version,
default="3.8.0", default="4.0.0",
metavar="MAJOR.MINOR.PATCH") metavar="MAJOR.MINOR.PATCH")
parser.add_argument( parser.add_argument(
"--swift-compiler-version", "--swift-compiler-version",

2
utils/build-script-impl
View File

@@ -165,7 +165,7 @@ KNOWN_SETTINGS=(
native-clang-tools-path "" "directory that contains Clang tools that are executable on the build machine" native-clang-tools-path "" "directory that contains Clang tools that are executable on the build machine"
native-swift-tools-path "" "directory that contains Swift tools that are executable on the build machine" native-swift-tools-path "" "directory that contains Swift tools that are executable on the build machine"
compiler-vendor "none" "compiler vendor name [none,apple]" compiler-vendor "none" "compiler vendor name [none,apple]"
clang-user-visible-version "3.8.0" "user-visible version of the embedded Clang and LLVM compilers" clang-user-visible-version "4.0.0" "user-visible version of the embedded Clang and LLVM compilers"
swift-user-visible-version "3.0" "user-visible version of the Swift language" swift-user-visible-version "3.0" "user-visible version of the Swift language"
swift-compiler-version "" "string that indicates a compiler version for Swift" swift-compiler-version "" "string that indicates a compiler version for Swift"
clang-compiler-version "" "string that indicates a compiler version for Clang" clang-compiler-version "" "string that indicates a compiler version for Clang"

2
utils/swift_build_support/swift_build_support/products/llvm.py
View File

@@ -46,7 +46,7 @@ class LLVM(product.Product):
return [ return [
"-DCLANG_VENDOR=Apple", "-DCLANG_VENDOR=Apple",
"-DCLANG_VENDOR_UTI=com.apple.compilers.llvm.clang", "-DCLANG_VENDOR_UTI=com.apple.compilers.llvm.clang",
# This is safe since we always provide a default of 3.8.0 # This is safe since we always provide a default.
"-DPACKAGE_VERSION={}".format(self.args.clang_user_visible_version) "-DPACKAGE_VERSION={}".format(self.args.clang_user_visible_version)
] ]