maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[gn build] manually port c747b7d1d9 more (config.osx_sysroot)

This commit is contained in:
Nico Weber 2021-06-22 15:31:33 -04:00
parent dedeb66191
commit 356d6b7b8a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
llvm/utils/gn/secondary/llvm/test/BUILD.gn
View File

@ -6,6 +6,7 @@ import("//llvm/utils/gn/build/libs/pthread/enable.gni")
import("//llvm/utils/gn/build/libs/xar/enable.gni") import("//llvm/utils/gn/build/libs/xar/enable.gni")
import("//llvm/utils/gn/build/libs/xml/enable.gni") import("//llvm/utils/gn/build/libs/xml/enable.gni")
import("//llvm/utils/gn/build/libs/zlib/enable.gni") import("//llvm/utils/gn/build/libs/zlib/enable.gni")
import("//llvm/utils/gn/build/mac_sdk.gni")
import("//llvm/utils/gn/build/write_cmake_config.gni") import("//llvm/utils/gn/build/write_cmake_config.gni")
import("//llvm/utils/llvm-lit/lit_path_function.gni") import("//llvm/utils/llvm-lit/lit_path_function.gni")
import("llvm_lit_site_cfg_files.gni") import("llvm_lit_site_cfg_files.gni")
@ -85,10 +86,6 @@ write_lit_config("lit_site_cfg") {
"LLVM_BUILD_EXAMPLES=0", "LLVM_BUILD_EXAMPLES=0",
"LLVM_HAVE_TF_AOT=0", "LLVM_HAVE_TF_AOT=0",
"LLVM_HAVE_TF_API=0", "LLVM_HAVE_TF_API=0",
# See https://reviews.llvm.org/D104332
# FIXME: Maybe set to mac_sdk_path if host_os == "mac"?
"CMAKE_OSX_SYSROOT=",
] ]
if (host_cpu == "x64") { if (host_cpu == "x64") {
@ -154,9 +151,15 @@ write_lit_config("lit_site_cfg") {
extra_values += [ "GOLD_EXECUTABLE=" ] extra_values += [ "GOLD_EXECUTABLE=" ]
} }
if (host_os == "mac") { if (host_os == "mac") {
extra_values += [ "LD64_EXECUTABLE=ld" ] extra_values += [
"CMAKE_OSX_SYSROOT=" + rebase_path(mac_sdk_path, dir),
"LD64_EXECUTABLE=ld",
]
} else { } else {
extra_values += [ "LD64_EXECUTABLE=" ] extra_values += [
"CMAKE_OSX_SYSROOT=",
"LD64_EXECUTABLE=",
]
} }
if (llvm_enable_assertions) { if (llvm_enable_assertions) {