summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-09-13 16:51:25 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-09-13 16:51:26 +0000
commitab48c407995d1d2c4d131a7b857aa96ca6384f08 (patch)
tree11d67da59f45732ce810cee620e4f7185e766ef7
parentfdc6957a5b0f9129bb5e296fa3fab5df8df3f8e7 (diff)
parent53e084dff90802196cb93eb16528a3183b3cf3d0 (diff)
download3.3-master.tar.gz
Merge "Rename bin/clang to bin/analyzer"HEADmastermainidea133-weekly-releaseidea133
-rwxr-xr-xbin/analyzerbin0 -> 46819952 bytes
l---------bin/analyzer++1
-rwxr-xr-xbin/ccc-analyzer2
-rwxr-xr-xbin/ccc-syntax4
l---------[-rwxr-xr-x]bin/clangbin46819952 -> 8 bytes
l---------bin/clang++1
-rwxr-xr-xbin/cxx-analyzer2
-rwxr-xr-xbin/cxx-syntax4
8 files changed, 7 insertions, 7 deletions
diff --git a/bin/analyzer b/bin/analyzer
new file mode 100755
index 0000000..b0ec791
--- /dev/null
+++ b/bin/analyzer
Binary files differ
diff --git a/bin/analyzer++ b/bin/analyzer++
new file mode 120000
index 0000000..2c7cce3
--- /dev/null
+++ b/bin/analyzer++
@@ -0,0 +1 @@
+analyzer \ No newline at end of file
diff --git a/bin/ccc-analyzer b/bin/ccc-analyzer
index 585ff9f..15f7901 100755
--- a/bin/ccc-analyzer
+++ b/bin/ccc-analyzer
@@ -88,7 +88,7 @@ CLANG_FLAGS_END="$CLANG_FLAGS_END -Wno-return-type-c-linkage"
# Call the real ccc-analyzer. Note that tools/scan-build/ccc-analyzer "exec" $CCC_CC,
# which is LOCAL_CC w/o optional ccache (in "ccache gcc" format)
export CCC_CC="${LOCAL_CC##* }"
-export CLANG="`dirname $0`/clang"
+export CLANG="`dirname $0`/analyzer"
export CLANG_FLAGS
export CLANG_FLAGS_END
`dirname $0`/../tools/scan-build/ccc-analyzer "$@"
diff --git a/bin/ccc-syntax b/bin/ccc-syntax
index 89dc54f..ea530f6 100755
--- a/bin/ccc-syntax
+++ b/bin/ccc-syntax
@@ -89,9 +89,9 @@ fi
CLANG_FLAGS_END="$CLANG_FLAGS_END -Wno-return-type-c-linkage"
# Call it
-`dirname $0`/clang $CLANG_FLAGS "$@" $CLANG_FLAGS_END
+`dirname $0`/analyzer $CLANG_FLAGS "$@" $CLANG_FLAGS_END
if [ "$?" != 0 ]; then
- test $WITH_SYNTAX_CHECK -ge 2 && echo '*** ERROR ***': `dirname $0`/clang $CLANG_FLAGS "$@" $CLANG_FLAGS_END
+ test $WITH_SYNTAX_CHECK -ge 2 && echo '*** ERROR ***': `dirname $0`/analyzer $CLANG_FLAGS "$@" $CLANG_FLAGS_END
exit 1
fi
$LOCAL_CC "$@" \ No newline at end of file
diff --git a/bin/clang b/bin/clang
index b0ec791..2c7cce3 100755..120000
--- a/bin/clang
+++ b/bin/clang
Binary files differ
diff --git a/bin/clang++ b/bin/clang++
deleted file mode 120000
index 060d289..0000000
--- a/bin/clang++
+++ /dev/null
@@ -1 +0,0 @@
-clang \ No newline at end of file
diff --git a/bin/cxx-analyzer b/bin/cxx-analyzer
index 27aba91..d03fed1 100755
--- a/bin/cxx-analyzer
+++ b/bin/cxx-analyzer
@@ -85,7 +85,7 @@ CLANG_FLAGS_END="$CLANG_FLAGS_END -Wno-return-type-c-linkage"
# Call the real c++-analyzer. Note that tools/scan-build/c++-analyzer "exec" $CCC_CXX,
# which is LOCAL_CXX w/o optional ccache (in "ccache g++" format)
export CCC_CXX="${LOCAL_CXX##* }"
-export CLANG_CXX="`dirname $0`/clang++"
+export CLANG_CXX="`dirname $0`/analyzer++"
export CLANG_FLAGS
export CLANG_FLAGS_END
`dirname $0`/../tools/scan-build/c++-analyzer "$@"
diff --git a/bin/cxx-syntax b/bin/cxx-syntax
index 8962759..8e4a3b4 100755
--- a/bin/cxx-syntax
+++ b/bin/cxx-syntax
@@ -86,9 +86,9 @@ fi
CLANG_FLAGS_END="$CLANG_FLAGS_END -Wno-return-type-c-linkage"
# Call it
-`dirname $0`/clang++ $CLANG_FLAGS "$@" $CLANG_FLAGS_END
+`dirname $0`/analyzer++ $CLANG_FLAGS "$@" $CLANG_FLAGS_END
if [ "$?" != 0 ]; then
- test $WITH_SYNTAX_CHECK -ge 2 && echo '*** ERROR ***': `dirname $0`/clang++ $CLANG_FLAGS "$@" $CLANG_FLAGS_END
+ test $WITH_SYNTAX_CHECK -ge 2 && echo '*** ERROR ***': `dirname $0`/analyzer++ $CLANG_FLAGS "$@" $CLANG_FLAGS_END
exit 1
fi
$LOCAL_CXX "$@"