From 9003ce9a2ae2beb2e9f6f71dd979cdbba6a9a969 Mon Sep 17 00:00:00 2001 From: Alexander Guettler Date: Mon, 9 Jul 2018 11:39:21 -0400 Subject: [PATCH] Windows: Remove /llvmlibthin from link command (issue #2470) --- patch/patches/gn_config.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index f27abaf2b..739f4c0b7 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -56,7 +56,7 @@ index 982fbe8d3f0d..e757be4688f1 100644 + "studio path") } diff --git build/toolchain/win/BUILD.gn build/toolchain/win/BUILD.gn -index 4d9d1f45f870..c668f93a50f3 100644 +index 4d9d1f45f870..7a601e634a69 100644 --- build/toolchain/win/BUILD.gn +++ build/toolchain/win/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni") @@ -76,6 +76,15 @@ index 4d9d1f45f870..c668f93a50f3 100644 } else { goma_prefix = "" } +@@ -108,7 +111,7 @@ template("msvc_toolchain") { + + # lld-link includes a replacement for lib.exe that can produce thin + # archives and understands bitcode (for lto builds). +- lib = "$prefix/$lld_link /lib /llvmlibthin" ++ lib = "$prefix/$lld_link /lib" + link = "$prefix/$lld_link" + if (host_os != "win") { + # See comment adding --rsp-quoting to $cl above for more information. diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py index d63b131aea35..6aca4e2cc56e 100644 --- build/toolchain/win/setup_toolchain.py