Index: Makefile =================================================================== --- Makefile (revision 1679) +++ Makefile (working copy) @@ -1,9 +1,10 @@ SVN_ROOT=.. OPT=1 +OS=darwin include ../common.mk VALGRIND_ROOT=../third_party/valgrind -VALGRIND_INST_ROOT=../tsan_inst +VALGRIND_INST_ROOT=$(VALGRIND_ROOT)/inst STLPORT_ROOT=../third_party/stlport GTEST_ROOT=../third_party/googletest OFFLINE=0