From 45cc24389b176993e24bd25ad8e34194d2763ead Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 1 Apr 2024 09:35:43 -0500 Subject: [PATCH] Revert "try conda compilers with libstdc++ from devtoolset" This reverts commit 9f8356012455106c1b1638784df4d3048c224987. --- recipe/build_openmm.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/recipe/build_openmm.sh b/recipe/build_openmm.sh index 3e6518f..53e26ec 100644 --- a/recipe/build_openmm.sh +++ b/recipe/build_openmm.sh @@ -18,17 +18,11 @@ fi if [[ "$use_conda_compilers" == "0" ]]; then /usr/bin/sudo -n yum install -y centos-release-scl /usr/bin/sudo -n yum install -y devtoolset-11-gcc "devtoolset-11-gcc-c++" - #source /opt/rh/devtoolset-11/enable - LIBGCC_DIR_OLD=$(dirname $(/opt/rh/devtoolset-11/root/usr/bin/gcc -print-libgcc-file-name)) - LIBGCC_DIR=$(dirname $($CC -print-libgcc-file-name)) - cp ${LIBGCC_DIR_OLD}/libstdc++* ${LIBGCC_DIR} + source /opt/rh/devtoolset-11/enable + LIBGCC_DIR=$(dirname $(gcc -print-libgcc-file-name)) export LDFLAGS="-L$LIBGCC_DIR $LDFLAGS" - export CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" - - # Workaround distutils issues - export CC="$CC -L$LIBGCC_DIR" - export CXX="$CC -L$LIBGCC_DIR" - export CFLAGS="$CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" + export CC="$(which gcc) -L$LIBGCC_DIR" + export CXX="$(which g++) -L$LIBGCC_DIR" fi