StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don\'t use GTEST_OS_LINUX on Darwin am: 4a94683a60

Browse Source 
am: 390657eb77

* commit '390657eb77dbadad35aaf9e34c7f5eb4320c245e':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: I2eb48ff8c5ca427c23477bbb7cf69578e1c70f9a
This commit is contained in:
Dan Willemsen
2016-05-13 22:41:41 +00:00
committed by android-build-merger
parent 37fb4d0e7c 390657eb77
commit bd771fc737
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/cc.go
View File

@@ -2051,11 +2051,15 @@ func (test *testLinker) flags(ctx ModuleContext, flags Flags) Flags {
if ctx.Host() {
flags.CFlags = append(flags.CFlags, "-O0", "-g")
if ctx.HostType() == common.Windows {
switch ctx.HostType() {
case common.Windows:
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_WINDOWS")
} else {
case common.Linux:
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_LINUX")
flags.LdFlags = append(flags.LdFlags, "-lpthread")
case common.Darwin:
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_MAC")
flags.LdFlags = append(flags.LdFlags, "-lpthread")
}
} else {
flags.CFlags = append(flags.CFlags, "-DGTEST_OS_LINUX_ANDROID")