Commit e98080ba authored by mostynb's avatar mostynb Committed by Commit bot

use absolute path to clang plugins

clang + icecc has problems finding libFindBadConstructs.so, probably
due to a path bug in icecc.

We can however workaround this bug by using the canonical absolute path
instead of an absolute path that includes redundant directories (ie
remove "tools/clang/scripts/../../../" from the middle).  This has the
benefit of simplifying and shortening clang compile commands.

BUG=409571

Review URL: https://codereview.chromium.org/525733005

Cr-Commit-Position: refs/heads/master@{#295446}
parent cab385fa
......@@ -5,8 +5,8 @@
# This script returns the flags that should be passed to clang.
THIS_ABS_DIR=$(cd $(dirname $0) && echo $PWD)
CLANG_LIB_PATH=$THIS_ABS_DIR/../../../third_party/llvm-build/Release+Asserts/lib
SRC_DIR=$(cd $(dirname $0)/../../.. && echo $PWD)
CLANG_LIB_PATH=$SRC_DIR/third_party/llvm-build/Release+Asserts/lib
if uname -s | grep -q Darwin; then
LIBSUFFIX=dylib
......@@ -14,7 +14,7 @@ else
LIBSUFFIX=so
fi
LIBNAME=\
$(grep 'set(LIBRARYNAME' "$THIS_ABS_DIR"/../blink_gc_plugin/CMakeLists.txt \
$(grep 'set(LIBRARYNAME' "$SRC_DIR"/tools/clang/blink_gc_plugin/CMakeLists.txt \
| cut -d ' ' -f 2 | tr -d ')')
FLAGS=""
......
......@@ -7,8 +7,8 @@
# clang_use_chrome_plugins. The flags are stored in a script so that they can
# be changed on the bots without requiring a master restart.
THIS_ABS_DIR=$(cd $(dirname $0) && echo $PWD)
CLANG_LIB_PATH=$THIS_ABS_DIR/../../../third_party/llvm-build/Release+Asserts/lib
SRC_ABS_DIR=$(cd $(dirname $0)/../../.. && echo $PWD)
CLANG_LIB_PATH=$SRC_ABS_DIR/third_party/llvm-build/Release+Asserts/lib
if uname -s | grep -q Darwin; then
LIBSUFFIX=dylib
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment