diff options
| -rw-r--r-- | android/arch.go | 2 | ||||
| -rw-r--r-- | cc/config/x86_linux_bionic_host.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/android/arch.go b/android/arch.go index e250c6e7..2543fcac 100644 --- a/android/arch.go +++ b/android/arch.go @@ -194,7 +194,7 @@ var ( NoOsType OsType Linux = NewOsType("linux_glibc", Host, false) Darwin = NewOsType("darwin", Host, false) - LinuxBionic = NewOsType("linux_bionic", Host, true) + LinuxBionic = NewOsType("linux_bionic", Host, false) Windows = NewOsType("windows", HostCross, true) Android = NewOsType("android", Device, false) diff --git a/cc/config/x86_linux_bionic_host.go b/cc/config/x86_linux_bionic_host.go index 8a125230..5fb88e66 100644 --- a/cc/config/x86_linux_bionic_host.go +++ b/cc/config/x86_linux_bionic_host.go @@ -139,6 +139,10 @@ func (t *toolchainLinuxBionic) Bionic() bool { return true } +func (toolchainLinuxBionic) LibclangRuntimeLibraryArch() string { + return "x86_64" +} + var toolchainLinuxBionicSingleton Toolchain = &toolchainLinuxBionic{} func linuxBionicToolchainFactory(arch android.Arch) Toolchain { |