Ensure CI tests only link to libstdc++ (not libc++)

STEllAR-GROUP · Jun 12, 2024 · 7c21e30 · 7c21e30
1 parent d3e7d5f
commit 7c21e30
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/.github/workflows/hpxmp-tests.yml b/.github/workflows/hpxmp-tests.yml
@@ -9,35 +9,25 @@ jobs:
 
     steps:
 
-      - name: Install dependencies
-        run: |
-          apt-get update
-          # apt-get install -y \
-          #   libc++-12-dev \
-          #   libc++abi-12-dev
-
       - name: Set environment variables
         run: |
           echo "ROOT_DIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
-          echo "BUILD_TYPE=RelWithDebInfo" >> $GITHUB_ENV
-          echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
-          echo "LDFLAGS=-stdlib=libc++" >> $GITHUB_ENV
+          echo "BUILD_TYPE=Debug" >> $GITHUB_ENV
 
       - name: Build HPX
         run: |
           HPX_SRC_DIR=${ROOT_DIR}/hpx
           HPX_BUILD_DIR=${HPX_SRC_DIR}/cmake-build-${BUILD_TYPE}
           HPX_INSTALL_DIR=${HPX_SRC_DIR}/cmake-install-${BUILD_TYPE}
           git clone --depth 1 https://github.com/STEllAR-GROUP/hpx ${HPX_SRC_DIR}
-          # Full build of HPX is needed to get the headers required by HPXC installed properly 
+          # Full build of HPX is needed to get some headers required by HPXC installed properly 
           cmake -G Ninja -S ${HPX_SRC_DIR} -B ${HPX_BUILD_DIR} \
             -DHPX_WITH_FETCH_ASIO=ON \
             -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
             -DCMAKE_INSTALL_PREFIX=${HPX_INSTALL_DIR} \
             -DHPX_WITH_DYNAMIC_HPX_MAIN=OFF \
             -DHPX_WITH_EXAMPLES=OFF \
-            -DHPX_WITH_TESTS=OFF \
-            -DHPX_WITH_NETWORKING=OFF
+            -DHPX_WITH_TESTS=OFF
           cmake --build ${HPX_BUILD_DIR}
           cmake --install ${HPX_BUILD_DIR}
           echo "HPX_INSTALL_DIR=${HPX_SRC_DIR}/cmake-install-${BUILD_TYPE}" >> $GITHUB_ENV
@@ -64,7 +54,7 @@ jobs:
       - name: Fetch LLVM
         run: |
           LLVM_SRC_DIR=${ROOT_DIR}/llvm-project
-          # Needed to fetch PRs
+          # Checkout current PR
           git clone https://github.com/STEllAR-GROUP/llvm-project ${LLVM_SRC_DIR}
           git -C ${LLVM_SRC_DIR} fetch origin +$GITHUB_SHA:refs/remotes/origin/pr
           git -C ${LLVM_SRC_DIR} checkout $GITHUB_SHA
@@ -122,13 +112,13 @@ jobs:
             -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
             -DCMAKE_VERBOSE_MAKEFILE=ON \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DHPX_DIR=${HPX_INSTALL_DIR}/lib/cmake/HPX \
-            -DHPXC_DIR=${HPXC_INSTALL_DIR} \
             -DOPENMP_ENABLE_LIBOMPTARGET=OFF \
             -DLIBOMP_OMPD_SUPPORT=OFF \
             -DLIBOMP_USE_ITT_NOTIFY=OFF \
             -DOPENMP_LLVM_TOOLS_DIR=${LLVM_UTILS_BIN_DIR} \
             -DWITH_HPXC=ON \
+            -DHPXC_ROOT=${HPXC_INSTALL_DIR} \
+            -DHPX_ROOT=${HPX_INSTALL_DIR} \
             -Wdev -S ${HPXMP_SRC_DIR} -B ${HPXMP_BUILD_DIR}
           cmake --build ${HPXMP_BUILD_DIR}
           cmake --install ${HPXMP_BUILD_DIR}