diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-03-09 10:30:22 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-03-09 10:30:22 -0800 |
commit | 282a4b0dda2eea7c4bc8d277ab52e5fc24f234e8 (patch) | |
tree | f7076480c9ade23ee2a8ad8431ebd8bb6203e3bd /cc/cc.go | |
parent | 71ea9c13c90b2c5bfefd196caa442777eb0f8ce2 (diff) | |
download | build_soong-282a4b0dda2eea7c4bc8d277ab52e5fc24f234e8.tar.gz build_soong-282a4b0dda2eea7c4bc8d277ab52e5fc24f234e8.tar.bz2 build_soong-282a4b0dda2eea7c4bc8d277ab52e5fc24f234e8.zip |
Fix C++ on Darwin
Port of https://android-review.googlesource.com/207241
Change-Id: Idad81a528a2104579de0225b0724bb81293eea44
Diffstat (limited to 'cc/cc.go')
-rw-r--r-- | cc/cc.go | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -955,6 +955,10 @@ func (c *CCLinked) flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags // Host builds will use GNU libstdc++. if ctx.Device() { flags.CFlags = append(flags.CFlags, "-I"+common.PathForSource(ctx, "bionic/libstdc++/include").String()) + } else { + // Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else + flags.CppFlags = append(flags.CppFlags, flags.Toolchain.SystemCppCppflags()) + flags.LdFlags = append(flags.LdFlags, flags.Toolchain.SystemCppLdflags()) } case "ndk_system": ndkSrcRoot := common.PathForSource(ctx, "prebuilts/ndk/current/sources/cxx-stl/system/include") |