[llvm] ca5902c - Revert "[gn build] port f7a33090a910"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2022-08-19T07:40:45-04:00
New Revision: ca5902cc8246939c40d67152cd046cc26cfd41aa

URL: https://github.com/llvm/llvm-project/commit/ca5902cc8246939c40d67152cd046cc26cfd41aa
DIFF: https://github.com/llvm/llvm-project/commit/ca5902cc8246939c40d67152cd046cc26cfd41aa.diff

LOG: Revert "[gn build] port f7a33090a910"

This reverts commit d3a1dbc4907b59690f9013cdb6221573ca4233f1.
f7a33090a910 was reverted in e941b031d316.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
    llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
index 7af6ea8df2dc9..1d598d913501b 100644
--- a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
@@ -18,7 +18,6 @@ write_cmake_config("Config") {
     "CLANG_DEFAULT_OBJCOPY=objcopy",
     "CLANG_DEFAULT_OPENMP_RUNTIME=libomp",
     "CLANG_DEFAULT_UNWINDLIB=",
-    "CLANG_INSTALL_LIBDIR_BASENAME=lib",
     "CLANG_OPENMP_NVPTX_DEFAULT_ARCH=sm_35",
     "CLANG_LIBDIR_SUFFIX=",
     "CLANG_RESOURCE_DIR=",

diff  --git a/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn b/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
index 6e512bb71ea88..2df3cb3e3a4fa 100644
--- a/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
@@ -21,7 +21,6 @@ write_cmake_config("Config") {
     "LLDB_ENABLE_PYTHON=",
     "LLDB_ENABLE_FBSDVMCORE=",
     "LLDB_EMBED_PYTHON_HOME=",
-    "LLDB_INSTALL_LIBDIR_BASENAME=lib",
     "LLDB_GLOBAL_INIT_DIRECTORY=",
 
     "LLDB_PYTHON_HOME=",