diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-07-20 21:22:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-20 21:22:17 +0000 |
| commit | ff3a2e4d55b9810df06cfe2b4424cc3948131f2b (patch) | |
| tree | eb644cc10d8c65edfb09dd00d1a229209427ce06 | |
| parent | e36d753ed1cc8224c40dfa4753038d9f4cd24881 (diff) | |
| parent | 2b1f0943f5b1611c3518e77da8598518780a64f1 (diff) | |
| download | build_soong-ff3a2e4d55b9810df06cfe2b4424cc3948131f2b.tar.gz build_soong-ff3a2e4d55b9810df06cfe2b4424cc3948131f2b.tar.bz2 build_soong-ff3a2e4d55b9810df06cfe2b4424cc3948131f2b.zip | |
Merge "Add more allowed ldlibs for darwin and windows"
| -rw-r--r-- | cc/x86_darwin_host.go | 1 | ||||
| -rw-r--r-- | cc/x86_windows_host.go | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/cc/x86_darwin_host.go b/cc/x86_darwin_host.go index 2894f7e4..d514c147 100644 --- a/cc/x86_darwin_host.go +++ b/cc/x86_darwin_host.go @@ -81,6 +81,7 @@ var ( "c", "dl", "m", + "ncurses", "pthread", "z", }, "-l") diff --git a/cc/x86_windows_host.go b/cc/x86_windows_host.go index cc0ef668..3a55dbfc 100644 --- a/cc/x86_windows_host.go +++ b/cc/x86_windows_host.go @@ -76,6 +76,16 @@ var ( "-m64", "-L${windowsGccRoot}/${windowsGccTriple}/lib64", } + + windowsAvailableLibraries = addPrefix([]string{ + "gdi32", + "imagehlp", + "ole32", + "psapi", + "userenv", + "uuid", + "ws2_32", + }, "-l") ) const ( @@ -187,6 +197,10 @@ func (t *toolchainWindows) ExecutableSuffix() string { return ".exe" } +func (t *toolchainWindows) AvailableLibraries() []string { + return windowsAvailableLibraries +} + var toolchainWindowsX86Singleton Toolchain = &toolchainWindowsX86{} var toolchainWindowsX8664Singleton Toolchain = &toolchainWindowsX8664{} |