[llvm-commits] [compiler-rt] r160259 - /compiler-rt/trunk/lib/tsan/go/buildgo.sh

[Dmitry Vyukov]

Author: dvyukov
Date: Mon Jul 16 05:36:39 2012
New Revision: 160259

URL: http://llvm.org/viewvc/llvm-project?rev=160259&view=rev
Log:
tsan: allow to pass CFLAGS to Go runtime build script

Modified:
    compiler-rt/trunk/lib/tsan/go/buildgo.sh

Modified: compiler-rt/trunk/lib/tsan/go/buildgo.sh
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/go/buildgo.sh?rev=160259&r1=160258&r2=160259&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/go/buildgo.sh (original)
+++ compiler-rt/trunk/lib/tsan/go/buildgo.sh Mon Jul 16 05:36:39 2012
@@ -19,6 +19,7 @@
 	../rtl/tsan_sync.cc
 	../../sanitizer_common/sanitizer_allocator.cc
 	../../sanitizer_common/sanitizer_common.cc
+	../../sanitizer_common/sanitizer_flags.cc
 	../../sanitizer_common/sanitizer_libc.cc
 	../../sanitizer_common/sanitizer_linux.cc
 	../../sanitizer_common/sanitizer_posix.cc
@@ -33,15 +34,15 @@
 	cat $F >> gotsan.cc
 done
 
-CFLAGS=" -I../rtl -I../.. -I../../sanitizer_common -fPIC -g -Wall -Werror -ffreestanding -fno-exceptions -DTSAN_GO -DSANITIZER_GO -DTSAN_SHADOW_COUNT=4"
+FLAGS=" -I../rtl -I../.. -I../../sanitizer_common -fPIC -g -Wall -Werror -ffreestanding -fno-exceptions -DTSAN_GO -DSANITIZER_GO -DTSAN_SHADOW_COUNT=4"
 if [ "$DEBUG" == "" ]; then
-	CFLAGS+=" -DTSAN_DEBUG=0 -O3 -fomit-frame-pointer"
+	FLAGS+=" -DTSAN_DEBUG=0 -O3 -fomit-frame-pointer"
 else
-	CFLAGS+=" -DTSAN_DEBUG=1 -g"
+	FLAGS+=" -DTSAN_DEBUG=1 -g"
 fi
 
-echo gcc gotsan.cc -S -o tmp.s $CFLAGS
-gcc gotsan.cc -S -o tmp.s $CFLAGS
+echo gcc gotsan.cc -S -o tmp.s $FLAGS $CFLAGS
+gcc gotsan.cc -S -o tmp.s $FLAGS $CFLAGS
 cat tmp.s $ASMS > gotsan.s
 echo as gotsan.s -o gotsan.syso
 as gotsan.s -o gotsan.syso