From 2b1f0943f5b1611c3518e77da8598518780a64f1 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 20 Jul 2016 12:47:47 -0700 Subject: [PATCH] Add more allowed ldlibs for darwin and windows Change-Id: If6217de9e369e29a2e716c5cbad4444e7312f197 --- cc/x86_darwin_host.go | 1 + cc/x86_windows_host.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/cc/x86_darwin_host.go b/cc/x86_darwin_host.go index 2894f7e46..d514c1476 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 cc0ef668e..3a55dbfca 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{}