|
120 | 120 |
|
121 | 121 | if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
|
122 | 122 | ASAN_LIB_PATH=$($INSTALL_PREFIX/llvm/bin/clang --print-runtime-dir)
|
| 123 | + if [ ! -d "$ASAN_LIB_PATH" ]; then |
| 124 | + CLANG_RES_DIR=$($INSTALL_PREFIX/llvm/bin/clang --print-resource-dir) |
| 125 | + ASAN_LIB_PATH="$CLANG_RES_DIR/lib/linux" |
| 126 | + fi |
123 | 127 | ASAN_RPATH_FLAGS="-Wl,-rpath=$ASAN_LIB_PATH -L$ASAN_LIB_PATH"
|
124 | 128 | CXXFLAGS="$CXXFLAGS $ASAN_RPATH_FLAGS -I$ROCM_DIR/include -I$ROCM_DIR/include/hsa"
|
125 | 129 | CFLAGS="$CFLAGS $ASAN_RPATH_FLAGS -I$ROCM_DIR/include -I$ROCM_DIR/include/hsa"
|
| 130 | + LDFLAGS=$LDFLAGS |
126 | 131 | fi
|
127 | 132 |
|
128 | 133 | if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
|
@@ -161,7 +166,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
|
161 | 166 | fi
|
162 | 167 |
|
163 | 168 | if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
|
164 |
| - ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=/asan" |
| 169 | + ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=/asan" |
165 | 170 | mkdir -p $BUILD_DIR/build/offload/asan
|
166 | 171 | cd $BUILD_DIR/build/offload/asan
|
167 | 172 | echo " ------Running offload-asan cmake ---- "
|
@@ -195,7 +200,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
|
195 | 200 |
|
196 | 201 | # Only use CMAKE_CXX/C_FLAGS on non-asan builds as these will overwrite the asan flags
|
197 | 202 | if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
|
198 |
| - ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=-debug/asan" |
| 203 | + ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=-debug/asan" |
199 | 204 | fi
|
200 | 205 |
|
201 | 206 | MYCMAKEOPTS="$MYCMAKEOPTS -DOFFLOAD_LIBDIR_SUFFIX=-debug"
|
|
0 commit comments