aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-11-19 20:05:58 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-11-19 20:05:58 +0000
commite349025485edf4a09907eee2d1f553d1f7fb5bd1 (patch)
tree31adda112b0bcf569a87299e2ca3721c461d2ba9 /scripts
parentb6c141fe2ad9665e975dfcc9ebf238cac4e77242 (diff)
downloadgoogletest-e349025485edf4a09907eee2d1f553d1f7fb5bd1.tar.gz
googletest-e349025485edf4a09907eee2d1f553d1f7fb5bd1.tar.bz2
googletest-e349025485edf4a09907eee2d1f553d1f7fb5bd1.zip
Fixes scripts/test/Makefile failing with link error.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/test/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/test/Makefile b/scripts/test/Makefile
index ffc0c90a..cdff5846 100644
--- a/scripts/test/Makefile
+++ b/scripts/test/Makefile
@@ -21,7 +21,9 @@ SAMPLE_DIR = ../../samples
GTEST_MAIN_CC = ../../src/gtest_main.cc
# Flags passed to the preprocessor.
-CPPFLAGS += -I$(FUSED_GTEST_DIR)
+# We have no idea here whether pthreads is available in the system, so
+# disable its use.
+CPPFLAGS += -I$(FUSED_GTEST_DIR) -DGTEST_HAS_PTHREAD=0
# Flags passed to the C++ compiler.
CXXFLAGS += -g