Merge "Fix macOS build." am: ddc3fb3dcf

am: 9b6d7f5753

Change-Id: Icb8a2ad88a45def7fde1226937b7b44401804584
This commit is contained in:
Elliott Hughes
2018-12-13 15:45:49 -08:00
committed by android-build-merger

View File

@@ -150,10 +150,6 @@ cc_binary {
// http://llvm.org/bugs/show_bug.cgi?id=21421 // http://llvm.org/bugs/show_bug.cgi?id=21421
"-O0", "-O0",
], ],
ldflags: [
// This makes the tests run a little faster.
"-Wl,--strip-all",
],
rtti: true, rtti: true,
local_include_dirs: [ local_include_dirs: [
"test/support", "test/support",
@@ -168,6 +164,14 @@ cc_binary {
}, },
compile_multilib: "both", compile_multilib: "both",
host_supported: true, host_supported: true,
target: {
linux: {
ldflags: [
// This makes the tests run a little faster.
"-Wl,--strip-all",
],
},
},
gnu_extensions: false, gnu_extensions: false,
cpp_std: "c++17", cpp_std: "c++17",
} }