Merge \"Add more allowed ldlibs for darwin and windows\"

am: ff3a2e4d55

Change-Id: I3a8417f38f381e1bd101ee66a13e5d0333855996
This commit is contained in:
Dan Willemsen
2016-07-20 21:27:04 +00:00
committed by android-build-merger
2 changed files with 15 additions and 0 deletions

View File

@@ -81,6 +81,7 @@ var (
"c", "c",
"dl", "dl",
"m", "m",
"ncurses",
"pthread", "pthread",
"z", "z",
}, "-l") }, "-l")

View File

@@ -76,6 +76,16 @@ var (
"-m64", "-m64",
"-L${windowsGccRoot}/${windowsGccTriple}/lib64", "-L${windowsGccRoot}/${windowsGccTriple}/lib64",
} }
windowsAvailableLibraries = addPrefix([]string{
"gdi32",
"imagehlp",
"ole32",
"psapi",
"userenv",
"uuid",
"ws2_32",
}, "-l")
) )
const ( const (
@@ -187,6 +197,10 @@ func (t *toolchainWindows) ExecutableSuffix() string {
return ".exe" return ".exe"
} }
func (t *toolchainWindows) AvailableLibraries() []string {
return windowsAvailableLibraries
}
var toolchainWindowsX86Singleton Toolchain = &toolchainWindowsX86{} var toolchainWindowsX86Singleton Toolchain = &toolchainWindowsX86{}
var toolchainWindowsX8664Singleton Toolchain = &toolchainWindowsX8664{} var toolchainWindowsX8664Singleton Toolchain = &toolchainWindowsX8664{}