diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-11-19 20:05:58 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-11-19 20:05:58 +0000 |
| commit | 1d59a3dde28ecccf49bc7b47285f8a7a39b0e5ba (patch) | |
| tree | 31adda112b0bcf569a87299e2ca3721c461d2ba9 /scripts | |
| parent | 3368924957466840f061744608ca615029057cb0 (diff) | |
| download | gtest-1d59a3dde28ecccf49bc7b47285f8a7a39b0e5ba.tar.gz gtest-1d59a3dde28ecccf49bc7b47285f8a7a39b0e5ba.tar.bz2 gtest-1d59a3dde28ecccf49bc7b47285f8a7a39b0e5ba.tar.xz | |
Fixes scripts/test/Makefile failing with link error.
git-svn-id: http://googletest.googlecode.com/svn/trunk@514 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/test/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/test/Makefile b/scripts/test/Makefile index ffc0c90..cdff584 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 |