diff options
| author | WenHan Gu <Wenhan.gu@mediatek.com> | 2013-11-06 00:00:48 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-24 11:54:38 -0700 |
| commit | e5218b7d1f3ebee9b7f3957400f2767fd291fae0 (patch) | |
| tree | f66d57038df8e6cb01b0dee9e97ba7bfdaeb902c | |
| parent | 06706f64f5fd2e79d07d9a2e165f7ccc4acdc656 (diff) | |
| download | llvm-e5218b7d1f3ebee9b7f3957400f2767fd291fae0.tar.gz | |
[ndk][conf] Patch for canadian cross build via NDK standalone.
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index f5bfd4e1d2e..b4a239eb2a7 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -523,11 +523,11 @@ #ifndef GTEST_HAS_CLONE // The user didn't tell us, so we need to figure it out. -# if GTEST_OS_LINUX && !defined(__ia64__) +# if GTEST_OS_LINUX && !defined(__ia64__) && !defined(__ANDROID__) # define GTEST_HAS_CLONE 1 # else # define GTEST_HAS_CLONE 0 -# endif // GTEST_OS_LINUX && !defined(__ia64__) +# endif // GTEST_OS_LINUX && !defined(__ia64__) && !defined(__ANDROID__) #endif // GTEST_HAS_CLONE |