diff options
Diffstat (limited to 'cc')
-rw-r--r-- | cc/config/global.go | 2 | ||||
-rw-r--r-- | cc/config/x86_darwin_host.go | 15 | ||||
-rw-r--r-- | cc/config/x86_linux_bionic_host.go | 6 | ||||
-rw-r--r-- | cc/config/x86_linux_host.go | 15 | ||||
-rw-r--r-- | cc/config/x86_windows_host.go | 14 |
5 files changed, 36 insertions, 16 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index 051eba54..d998ca2d 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -99,7 +99,7 @@ var ( hostGlobalLdflags = []string{} - hostGlobalLldflags = []string{} + hostGlobalLldflags = []string{"-fuse-ld=lld"} commonGlobalCppflags = []string{ "-Wsign-promo", diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go index 4aa8242d..4ec2b319 100644 --- a/cc/config/x86_darwin_host.go +++ b/cc/config/x86_darwin_host.go @@ -73,10 +73,16 @@ var ( darwinClangLdflags = ClangFilterUnknownCflags(darwinLdflags) + darwinClangLldflags = ClangFilterUnknownLldflags(darwinClangLdflags) + darwinX86ClangLdflags = ClangFilterUnknownCflags(darwinX86Ldflags) + darwinX86ClangLldflags = ClangFilterUnknownLldflags(darwinX86ClangLdflags) + darwinX8664ClangLdflags = ClangFilterUnknownCflags(darwinX8664Ldflags) + darwinX8664ClangLldflags = ClangFilterUnknownLldflags(darwinX8664ClangLdflags) + darwinSupportedSdkVersions = []string{ "10.10", "10.11", @@ -141,6 +147,7 @@ func init() { pctx.StaticVariable("DarwinClangCflags", strings.Join(darwinClangCflags, " ")) pctx.StaticVariable("DarwinClangLdflags", strings.Join(darwinClangLdflags, " ")) + pctx.StaticVariable("DarwinClangLldflags", strings.Join(darwinClangLldflags, " ")) // Extended cflags pctx.StaticVariable("DarwinX86Cflags", strings.Join(darwinX86Cflags, " ")) @@ -152,7 +159,9 @@ func init() { pctx.StaticVariable("DarwinX8664ClangCflags", strings.Join(ClangFilterUnknownCflags(darwinX8664Cflags), " ")) pctx.StaticVariable("DarwinX86ClangLdflags", strings.Join(darwinX86ClangLdflags, " ")) + pctx.StaticVariable("DarwinX86ClangLldflags", strings.Join(darwinX86ClangLldflags, " ")) pctx.StaticVariable("DarwinX8664ClangLdflags", strings.Join(darwinX8664ClangLdflags, " ")) + pctx.StaticVariable("DarwinX8664ClangLldflags", strings.Join(darwinX8664ClangLldflags, " ")) pctx.StaticVariable("DarwinX86YasmFlags", "-f macho -m x86") pctx.StaticVariable("DarwinX8664YasmFlags", "-f macho -m amd64") } @@ -274,8 +283,7 @@ func (t *toolchainDarwinX86) ClangLdflags() string { } func (t *toolchainDarwinX86) ClangLldflags() string { - // TODO: define and use Darwin*ClangLldflags - return "${config.DarwinClangLdflags} ${config.DarwinX86ClangLdflags}" + return "${config.DarwinClangLldflags} ${config.DarwinX86ClangLldflags}" } func (t *toolchainDarwinX8664) ClangLdflags() string { @@ -283,8 +291,7 @@ func (t *toolchainDarwinX8664) ClangLdflags() string { } func (t *toolchainDarwinX8664) ClangLldflags() string { - // TODO: define and use Darwin*ClangLldflags - return "${config.DarwinClangLdflags} ${config.DarwinX8664ClangLdflags}" + return "${config.DarwinClangLldflags} ${config.DarwinX8664ClangLldflags}" } func (t *toolchainDarwinX86) YasmFlags() string { diff --git a/cc/config/x86_linux_bionic_host.go b/cc/config/x86_linux_bionic_host.go index 057e905d..a9fb1f66 100644 --- a/cc/config/x86_linux_bionic_host.go +++ b/cc/config/x86_linux_bionic_host.go @@ -61,11 +61,14 @@ var ( // Use the device gcc toolchain "--gcc-toolchain=${LinuxBionicGccRoot}", }) + + linuxBionicLldflags = ClangFilterUnknownLldflags(linuxBionicLdflags) ) func init() { pctx.StaticVariable("LinuxBionicCflags", strings.Join(linuxBionicCflags, " ")) pctx.StaticVariable("LinuxBionicLdflags", strings.Join(linuxBionicLdflags, " ")) + pctx.StaticVariable("LinuxBionicLldflags", strings.Join(linuxBionicLldflags, " ")) pctx.StaticVariable("LinuxBionicIncludeFlags", bionicHeaders("x86")) @@ -127,8 +130,7 @@ func (t *toolchainLinuxBionic) ClangLdflags() string { } func (t *toolchainLinuxBionic) ClangLldflags() string { - // TODO: define and use LinuxBionicLldflags - return "${config.LinuxBionicLdflags}" + return "${config.LinuxBionicLldflags}" } func (t *toolchainLinuxBionic) ToolchainClangCflags() string { diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go index 6144fc2a..354500eb 100644 --- a/cc/config/x86_linux_host.go +++ b/cc/config/x86_linux_host.go @@ -78,18 +78,24 @@ var ( "--sysroot ${LinuxGccRoot}/sysroot", }...) + linuxClangLldflags = ClangFilterUnknownLldflags(linuxClangLdflags) + linuxX86ClangLdflags = append(ClangFilterUnknownCflags(linuxX86Ldflags), []string{ "-B${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}/32", "-L${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}/32", "-L${LinuxGccRoot}/${LinuxGccTriple}/lib32", }...) + linuxX86ClangLldflags = ClangFilterUnknownLldflags(linuxX86ClangLdflags) + linuxX8664ClangLdflags = append(ClangFilterUnknownCflags(linuxX8664Ldflags), []string{ "-B${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}", "-L${LinuxGccRoot}/lib/gcc/${LinuxGccTriple}/${LinuxGccVersion}", "-L${LinuxGccRoot}/${LinuxGccTriple}/lib64", }...) + linuxX8664ClangLldflags = ClangFilterUnknownLldflags(linuxX8664ClangLdflags) + linuxClangCppflags = []string{ "-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}", "-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/backward", @@ -134,6 +140,7 @@ func init() { pctx.StaticVariable("LinuxClangCflags", strings.Join(linuxClangCflags, " ")) pctx.StaticVariable("LinuxClangLdflags", strings.Join(linuxClangLdflags, " ")) + pctx.StaticVariable("LinuxClangLldflags", strings.Join(linuxClangLldflags, " ")) pctx.StaticVariable("LinuxClangCppflags", strings.Join(linuxClangCppflags, " ")) // Extended cflags @@ -147,7 +154,9 @@ func init() { pctx.StaticVariable("LinuxX8664ClangCflags", strings.Join(ClangFilterUnknownCflags(linuxX8664Cflags), " ")) pctx.StaticVariable("LinuxX86ClangLdflags", strings.Join(linuxX86ClangLdflags, " ")) + pctx.StaticVariable("LinuxX86ClangLldflags", strings.Join(linuxX86ClangLldflags, " ")) pctx.StaticVariable("LinuxX8664ClangLdflags", strings.Join(linuxX8664ClangLdflags, " ")) + pctx.StaticVariable("LinuxX8664ClangLldflags", strings.Join(linuxX8664ClangLldflags, " ")) pctx.StaticVariable("LinuxX86ClangCppflags", strings.Join(linuxX86ClangCppflags, " ")) pctx.StaticVariable("LinuxX8664ClangCppflags", strings.Join(linuxX8664ClangCppflags, " ")) // Yasm flags @@ -242,8 +251,7 @@ func (t *toolchainLinuxX86) ClangLdflags() string { } func (t *toolchainLinuxX86) ClangLldflags() string { - // TODO: define and use Linux*ClangLldflags - return "${config.LinuxClangLdflags} ${config.LinuxX86ClangLdflags}" + return "${config.LinuxClangLldflags} ${config.LinuxX86ClangLldflags}" } func (t *toolchainLinuxX8664) ClangLdflags() string { @@ -251,8 +259,7 @@ func (t *toolchainLinuxX8664) ClangLdflags() string { } func (t *toolchainLinuxX8664) ClangLldflags() string { - // TODO: define and use Linux*ClangLldflags - return "${config.LinuxClangLdflags} ${config.LinuxX8664ClangLdflags}" + return "${config.LinuxClangLldflags} ${config.LinuxX8664ClangLldflags}" } func (t *toolchainLinuxX86) YasmFlags() string { diff --git a/cc/config/x86_windows_host.go b/cc/config/x86_windows_host.go index fea62910..6fbff9f1 100644 --- a/cc/config/x86_windows_host.go +++ b/cc/config/x86_windows_host.go @@ -64,7 +64,8 @@ var ( windowsLdflags = []string{ "--enable-stdcall-fixup", } - windowsClangLdflags = append(ClangFilterUnknownCflags(windowsLdflags), []string{}...) + windowsClangLdflags = append(ClangFilterUnknownCflags(windowsLdflags), []string{}...) + windowsClangLldflags = ClangFilterUnknownLldflags(windowsClangLdflags) windowsX86Cflags = []string{ "-m32", @@ -84,6 +85,7 @@ var ( "-L${WindowsGccRoot}/lib/gcc/${WindowsGccTriple}/4.8.3/32", "-B${WindowsGccRoot}/${WindowsGccTriple}/lib32", }...) + windowsX86ClangLldflags = ClangFilterUnknownLldflags(windowsX86ClangLdflags) windowsX8664Ldflags = []string{ "-m64", @@ -94,6 +96,7 @@ var ( "-L${WindowsGccRoot}/lib/gcc/${WindowsGccTriple}/4.8.3", "-B${WindowsGccRoot}/${WindowsGccTriple}/lib64", }...) + windowsX8664ClangLldflags = ClangFilterUnknownLldflags(windowsX8664ClangLdflags) windowsAvailableLibraries = addPrefix([]string{ "gdi32", @@ -128,6 +131,7 @@ func init() { pctx.StaticVariable("WindowsClangCflags", strings.Join(windowsClangCflags, " ")) pctx.StaticVariable("WindowsClangLdflags", strings.Join(windowsClangLdflags, " ")) + pctx.StaticVariable("WindowsClangLldflags", strings.Join(windowsClangLldflags, " ")) pctx.StaticVariable("WindowsClangCppflags", strings.Join(windowsClangCppflags, " ")) pctx.StaticVariable("WindowsX86Cflags", strings.Join(windowsX86Cflags, " ")) @@ -140,7 +144,9 @@ func init() { pctx.StaticVariable("WindowsX8664ClangCflags", strings.Join(ClangFilterUnknownCflags(windowsX8664Cflags), " ")) pctx.StaticVariable("WindowsX86ClangLdflags", strings.Join(windowsX86ClangLdflags, " ")) + pctx.StaticVariable("WindowsX86ClangLldflags", strings.Join(windowsX86ClangLldflags, " ")) pctx.StaticVariable("WindowsX8664ClangLdflags", strings.Join(windowsX8664ClangLdflags, " ")) + pctx.StaticVariable("WindowsX8664ClangLldflags", strings.Join(windowsX8664ClangLldflags, " ")) pctx.StaticVariable("WindowsX86ClangCppflags", strings.Join(windowsX86ClangCppflags, " ")) pctx.StaticVariable("WindowsX8664ClangCppflags", strings.Join(windowsX8664ClangCppflags, " ")) @@ -246,8 +252,7 @@ func (t *toolchainWindowsX86) ClangLdflags() string { } func (t *toolchainWindowsX86) ClangLldflags() string { - // TODO: define and use Windows*ClangLldflags - return "${config.WindowsClangLdflags} ${config.WindowsX86ClangLdflags}" + return "${config.WindowsClangLldflags} ${config.WindowsX86ClangLldflags}" } func (t *toolchainWindowsX8664) ClangLdflags() string { @@ -255,8 +260,7 @@ func (t *toolchainWindowsX8664) ClangLdflags() string { } func (t *toolchainWindowsX8664) ClangLldflags() string { - // TODO: define and use Windows*ClangLldflags - return "${config.WindowsClangLdflags} ${config.WindowsX8664ClangLdflags}" + return "${config.WindowsClangLldflags} ${config.WindowsX8664ClangLldflags}" } func (t *toolchainWindows) ShlibSuffix() string { |