Skip to content

Commit 356d6b7

Browse files
committed
[gn build] manually port c747b7d more (config.osx_sysroot)
1 parent dedeb66 commit 356d6b7

File tree

1 file changed

+9
-6
lines changed
  • llvm/utils/gn/secondary/llvm/test

1 file changed

+9
-6
lines changed

llvm/utils/gn/secondary/llvm/test/BUILD.gn

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import("//llvm/utils/gn/build/libs/pthread/enable.gni")
66
import("//llvm/utils/gn/build/libs/xar/enable.gni")
77
import("//llvm/utils/gn/build/libs/xml/enable.gni")
88
import("//llvm/utils/gn/build/libs/zlib/enable.gni")
9+
import("//llvm/utils/gn/build/mac_sdk.gni")
910
import("//llvm/utils/gn/build/write_cmake_config.gni")
1011
import("//llvm/utils/llvm-lit/lit_path_function.gni")
1112
import("llvm_lit_site_cfg_files.gni")
@@ -85,10 +86,6 @@ write_lit_config("lit_site_cfg") {
8586
"LLVM_BUILD_EXAMPLES=0",
8687
"LLVM_HAVE_TF_AOT=0",
8788
"LLVM_HAVE_TF_API=0",
88-
89-
# See https://reviews.llvm.org/D104332
90-
# FIXME: Maybe set to mac_sdk_path if host_os == "mac"?
91-
"CMAKE_OSX_SYSROOT=",
9289
]
9390

9491
if (host_cpu == "x64") {
@@ -154,9 +151,15 @@ write_lit_config("lit_site_cfg") {
154151
extra_values += [ "GOLD_EXECUTABLE=" ]
155152
}
156153
if (host_os == "mac") {
157-
extra_values += [ "LD64_EXECUTABLE=ld" ]
154+
extra_values += [
155+
"CMAKE_OSX_SYSROOT=" + rebase_path(mac_sdk_path, dir),
156+
"LD64_EXECUTABLE=ld",
157+
]
158158
} else {
159-
extra_values += [ "LD64_EXECUTABLE=" ]
159+
extra_values += [
160+
"CMAKE_OSX_SYSROOT=",
161+
"LD64_EXECUTABLE=",
162+
]
160163
}
161164

162165
if (llvm_enable_assertions) {

0 commit comments

Comments
 (0)