Skip to content

Commit

Permalink
[build_offload] - Change LLVM_LIBDIR_SUFFIX to OFFLOAD_LIBDIR_SUFFIX
Browse files Browse the repository at this point in the history
This prevents the debug/asan/perf libraries from installing into
the default lib directory.
  • Loading branch information
estewart08 committed Apr 24, 2024
1 parent 7d85de2 commit 4922ca5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bin/build_offload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
fi

if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DLLVM_LIBDIR_SUFFIX=/asan"
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=/asan"
mkdir -p $BUILD_DIR/build/offload/asan
cd $BUILD_DIR/build/offload/asan
echo " ------Running offload-asan cmake ---- "
Expand Down Expand Up @@ -195,10 +195,10 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then

# Only use CMAKE_CXX/C_FLAGS on non-asan builds as these will overwrite the asan flags
if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DLLVM_LIBDIR_SUFFIX=-debug/asan"
ASAN_CMAKE_OPTS="$MYCMAKEOPTS -DSANITIZER_AMDGPU=1 -DOFFLOAD_LIBDIR_SUFFIX=-debug/asan"
fi

MYCMAKEOPTS="$MYCMAKEOPTS -DLLVM_LIBDIR_SUFFIX=-debug"
MYCMAKEOPTS="$MYCMAKEOPTS -DOFFLOAD_LIBDIR_SUFFIX=-debug"
if [ "$AOMP_BUILD_SANITIZER" != 1 ]; then
mkdir -p $BUILD_DIR/build/offload_debug
cd $BUILD_DIR/build/offload_debug
Expand Down

0 comments on commit 4922ca5

Please sign in to comment.