Merge changes from topic "windows-libcxx" am: f4ecf76b2d am: 2985a30e1e
am: 35e18e1daf
Change-Id: I71c86b830fbddd699f3cdbf9aa49a0f4d8816f79
This commit is contained in:
committed by
android-build-merger
commit
5de98d2295
@@ -79,10 +79,6 @@ var (
|
||||
"-B${WindowsGccRoot}/lib/gcc/${WindowsGccTriple}/4.8.3/32",
|
||||
"-L${WindowsGccRoot}/lib/gcc/${WindowsGccTriple}/4.8.3/32",
|
||||
"-B${WindowsGccRoot}/${WindowsGccTriple}/lib32",
|
||||
|
||||
// Bug: http://b/109759970 - WAR until issue with ld.bfd's
|
||||
// inability to handle Clang-generated section names is fixed.
|
||||
"-Wl,--allow-multiple-definition",
|
||||
}...)
|
||||
windowsX86ClangLldflags = ClangFilterUnknownLldflags(windowsX86ClangLdflags)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user