Skip to content

Commit 47bf996

Browse files
committed
Revert "[gn build] Manually port 90ccf21"
This reverts commit 46307f1. 90ccf21 was reverted in 030ee84.
1 parent 5120c51 commit 47bf996

File tree

1 file changed

+5
-18
lines changed
  • llvm/utils/gn/secondary/clang/test

1 file changed

+5
-18
lines changed

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

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ write_lit_config("lit_site_cfg") {
6565
"CMAKE_C_COMPILER=cc",
6666
"ENABLE_BACKTRACES=1",
6767
"ENABLE_SHARED=0",
68-
"LLVM_BUILD_EXAMPLES=0",
69-
"LLVM_BYE_LINK_INTO_TOOLS=0",
7068
"LLVM_EXTERNAL_LIT=",
7169
"LLVM_HOST_TRIPLE=$llvm_current_triple",
7270
"LLVM_LIT_TOOLS_DIR=", # Intentionally empty, matches cmake build.
@@ -113,37 +111,26 @@ write_lit_config("lit_site_cfg") {
113111
}
114112

115113
if (host_os == "mac") {
116-
extra_values += [
117-
"LLVM_PLUGIN_EXT=.dylib",
118-
"SHLIBEXT=.dylib",
119-
]
114+
extra_values += [ "LLVM_PLUGIN_EXT=.dylib" ]
120115
} else if (host_os == "win") {
121-
extra_values += [
122-
"LLVM_PLUGIN_EXT=.dll",
123-
"SHLIBEXT=.dll",
124-
]
116+
extra_values += [ "LLVM_PLUGIN_EXT=.dll" ]
125117
} else {
126-
extra_values += [
127-
"LLVM_PLUGIN_EXT=.so",
128-
"SHLIBEXT=.so",
129-
]
118+
extra_values += [ "LLVM_PLUGIN_EXT=.so" ]
130119
}
131120

132121
if (host_os == "win") {
133122
extra_values += [
134123
# See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn
135124
"CMAKE_LIBRARY_OUTPUT_DIRECTORY=" + rebase_path("$root_out_dir/bin", dir),
136-
"LLVM_ENABLE_PLUGINS=1",
137125
"LLVM_LIT_ERRC_MESSAGES=no such file or directory;is a directory;" +
138126
"invalid argument;permission denied",
139-
"PERL_EXECUTABLE=",
127+
"PERL_EXECUTABLE="
140128
]
141129
} else {
142130
extra_values += [
143131
"CMAKE_LIBRARY_OUTPUT_DIRECTORY=" + rebase_path("$root_out_dir/lib", dir),
144-
"LLVM_ENABLE_PLUGINS=1",
145132
"LLVM_LIT_ERRC_MESSAGES=",
146-
"PERL_EXECUTABLE=/usr/bin/perl",
133+
"PERL_EXECUTABLE=/usr/bin/perl"
147134
]
148135
}
149136

0 commit comments

Comments
 (0)