Build debug openmp libraries by dropping use of AOMP_BUILD_TRUNK
@@ -129,11 +129,8 @@ fi
# This is how we tell the hsa plugin where to find hsa
export HSA_RUNTIME_PATH=$ROCM_DIR/hsa
-# Trunk does not yet use standard library search for HIP device libs
-# So tell HIP where to find rocm-device-libs with HIP_DEVICE_LIB_PATH
-if [ "$AOMP_BUILD_TRUNK" != 0 ] ; then
+
export HIP_DEVICE_LIB_PATH=$ROCM_DIR/lib
-fi
if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
@@ -166,8 +163,6 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
exit 1
fi
- # We cannot build debug libs with hip till hip has support for robust posix printf
- if [ "$AOMP_BUILD_TRUNK" == 0 ] ; then
echo rm -rf $BUILD_DIR/build/openmp_debug
rm -rf $BUILD_DIR/build/openmp_debug
MYCMAKEOPTS="$COMMON_CMAKE_OPTS -DLIBOMPTARGET_NVPTX_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug $AOMP_ORIGIN_RPATH -DROCM_DIR=$ROCM_DIR"
@@ -188,7 +183,6 @@ if [ "$1" != "nocmake" ] && [ "$1" != "install" ] ; then
exit 1
fi
fi
-fi
cd $BUILD_DIR/build/openmp
echo
@@ -203,7 +197,6 @@ if [ $? != 0 ] ; then
exit 1
fi
-if [ "$AOMP_BUILD_TRUNK" == 0 ] ; then
cd $BUILD_DIR/build/openmp_debug
echo
echo
@@ -221,7 +214,6 @@ else
echo
fi
fi
-fi
# ----------- Install only if asked ----------------------------
if [ "$1" == "install" ] ; then
@@ -234,7 +226,6 @@ if [ "$1" == "install" ] ; then
exit 1
fi
- if [ "$AOMP_BUILD_TRUNK" == 0 ] ; then
cd $BUILD_DIR/build/openmp_debug
echo
echo " -----Installing to $INSTALL_OPENMP/lib-debug ---- "
@@ -244,4 +235,3 @@ if [ "$1" == "install" ] ; then
exit 1
fi
fi
-fi
