Fix

Author: Growl1234

toolchain/scripts/stage1/install_mpich.sh

@@ -176,10 +176,10 @@ EOF
     if [ "${with_mpich}" != "__SYSTEM__" ]; then
         cat << EOF >> "${BUILDDIR}/setup_mpich"
 prepend_path PATH "${pkg_install_dir}/bin"
-prepend_path LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
-prepend_path LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
-prepend_path LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
-prepend_path CPATH="${pkg_install_dir}/include":\${CPATH}
+prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
+prepend_path LD_RUN_PATH "${pkg_install_dir}/lib":\${LD_RUN_PATH}
+prepend_path LIBRARY_PATH "${pkg_install_dir}/lib":\${LIBRARY_PATH}
+prepend_path CPATH "${pkg_install_dir}/include":\${CPATH}
 EOF
     fi
     cat "${BUILDDIR}/setup_mpich" >> ${SETUPFILE}

toolchain/scripts/stage1/install_openmpi.sh

@@ -205,10 +205,10 @@ EOF
         if [ "${with_openmpi}" != "__SYSTEM__" ]; then
             cat << EOF >> "${BUILDDIR}/setup_openmpi"
 prepend_path PATH "${pkg_install_dir}/bin"
-prepend_path LD_LIBRARY_PATH="${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
-prepend_path LD_RUN_PATH="${pkg_install_dir}/lib":\${LD_RUN_PATH}
-prepend_path LIBRARY_PATH="${pkg_install_dir}/lib":\${LIBRARY_PATH}
-prepend_path CPATH="${pkg_install_dir}/include":\${CPATH}
+prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib":\${LD_LIBRARY_PATH}
+prepend_path LD_RUN_PATH "${pkg_install_dir}/lib":\${LD_RUN_PATH}
+prepend_path LIBRARY_PATH "${pkg_install_dir}/lib":\${LIBRARY_PATH}
+prepend_path CPATH "${pkg_install_dir}/include":\${CPATH}
 EOF
         fi
         cat "${BUILDDIR}/setup_openmpi" >> ${SETUPFILE}

toolchain/scripts/stage2/install_openblas.sh

@@ -175,8 +175,6 @@ if [ "$with_openblas" != "__DONTUSE__" ]; then
 prepend_path LD_LIBRARY_PATH "${pkg_install_dir}/lib"
 prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
 prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
-prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
-prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
 prepend_path CPATH "${pkg_install_dir}/include"
 EOF
         cat "${BUILDDIR}/setup_openblas" >> $SETUPFILE
@@ -189,8 +187,6 @@ export OPENBLAS_LIBS="${OPENBLAS_LIBS}"
 export MATH_CFLAGS="\${MATH_CFLAGS} ${OPENBLAS_CFLAGS}"
 export MATH_LDFLAGS="\${MATH_LDFLAGS} ${OPENBLAS_LDFLAGS}"
 export MATH_LIBS="\${MATH_LIBS} ${OPENBLAS_LIBS}"
-export PKG_CONFIG_PATH="${pkg_install_dir}/lib/pkgconfig"
-export CMAKE_PREFIX_PATH="${pkg_install_dir}"
 prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
 prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
 EOF

toolchain/scripts/stage4/install_libcomm.sh

@@ -41,7 +41,6 @@ source "${INSTALLDIR}"/toolchain.env
 
 [ -f "${BUILDDIR}/setup_libcomm" ] && rm "${BUILDDIR}/setup_libcomm"
 
-libcomm_CFLAGS=""
 ! [ -d "${BUILDDIR}" ] && mkdir -p "${BUILDDIR}"
 cd "${BUILDDIR}"
 
@@ -120,7 +119,7 @@ EOF
         cat "${BUILDDIR}/setup_libcomm" >> $SETUPFILE
     fi
     cat << EOF >> "${BUILDDIR}/setup_libcomm"
-export LIBCOMM_CFLAGS="${libcomm_CFLAGS}"
+export LIBCOMM_CFLAGS="${LIBCOMM_CFLAGS}"
 export LIBCOMM_ROOT="${pkg_install_dir}"
 EOF
 fi

toolchain/scripts/stage4/install_libri.sh

@@ -39,7 +39,6 @@ source "${INSTALLDIR}"/toolchain.env
 
 [ -f "${BUILDDIR}/setup_libri" ] && rm "${BUILDDIR}/setup_libri"
 
-libri_CFLAGS=""
 ! [ -d "${BUILDDIR}" ] && mkdir -p "${BUILDDIR}"
 cd "${BUILDDIR}"
 
@@ -119,7 +118,7 @@ EOF
         cat "${BUILDDIR}/setup_libri" >> $SETUPFILE
     fi
     cat << EOF >> "${BUILDDIR}/setup_libri"
-export LIBRI_CFLAGS="${libri_CFLAGS}"
+export LIBRI_CFLAGS="${LIBRI_CFLAGS}"
 export LIBRI_ROOT="${pkg_install_dir}"
 EOF
 fi

toolchain/scripts/stage4/install_libtorch.sh

@@ -111,6 +111,7 @@ prepend_path LD_RUN_PATH "${pkg_install_dir}/lib"
 prepend_path LIBRARY_PATH "${pkg_install_dir}/lib"
 prepend_path PKG_CONFIG_PATH "${pkg_install_dir}/lib/pkgconfig"
 prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
+prepend_path CPATH "${pkg_install_dir}/include"
 EOF
     fi
     if [ "$ENABLE_CUDA" = "__TRUE__" ]; then

toolchain/scripts/stage4/install_rapidjson.sh

@@ -121,10 +121,6 @@ if [ "$with_rapidjson" != "__DONTUSE__" ]; then
         cat << EOF > "${BUILDDIR}/setup_rapidjson"
 prepend_path CPATH "${pkg_install_dir}/include"
 prepend_path CMAKE_PREFIX_PATH "${pkg_install_dir}"
-EOF
-    else
-        cat << EOF > "${BUILDDIR}/setup_rapidjson"
-export RAPIDJSON_ROOT="${pkg_install_dir}"
 EOF
     fi
     cat "${BUILDDIR}/setup_rapidjson" >> $SETUPFILE