From 7e121466e8475e5a92fdb52953c1e4bb0f42b897 Mon Sep 17 00:00:00 2001
From: "R.K.Garcia" <rkgarcia@wisc.edu>
Date: Fri, 7 Feb 2025 16:31:27 +0000
Subject: [PATCH] push-pop LIBRARY_PATH workaround for gcc
---
ShellB3/shallbethree.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index a23e71ea..728ba9bd 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -7248,7 +7248,9 @@ mk__gcc() {
fi
# https://github.com/riscv-collab/riscv-gnu-toolchain/issues/860
+ export xxLIBRARY_PATHxx="$LIBRARY_PATH"
unset LIBRARY_PATH
+ export xxLD_LIBRARY_PATHxx="$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH="$BASE/lib:$BASE/lib64:$LD_LIBRARY_PATH"
CXXFLAGS="$(omitparameter -stdlib=libc++ 0 ${CXXFLAGS})" CPPFLAGS="$(omitparameter -stdlib=libc++ 0 ${CPPFLAGS}) $( isDarwin && echo -DHAVE_FCNTL_H=1 -DHAVE_SPAWN_H=1)" \
@@ -7256,6 +7258,11 @@ mk__gcc() {
--with-mpc=${BASE} --bindir=${BASE}/sysbin --disable-libgcj --with-isl=${BASE} --enable-checking=release \
--disable-multilib --enable-languages=${LANGS} ${EXTRAPARMS} "$@"
+ export LD_LIBRARY_PATH="$xxLD_LIBRARY_PATHxx"
+ export LIBRARY_PATH="$xxLIBRARY_PATHxx"
+ unset xxLIBRARY_PATHxx
+ unset xxLD_LIBRARY_PATHxx
+
if isFalse BUILD_GCPP ; then
rm -f ${BASE}/*/lib*san.* ${BASE}/*/libstdc++* ${BASE}/*bin*/c++ ${BASE}/*bin*/g++ ${BASE}/*bin*/cc ${BASE}/*bin*/gcc
rm -f ${REALBASE}/*/lib*san.* ${BAREALBASESE}/*/libstdc++* ${REALBASE}/*bin*/c++ ${REALBASE}/*bin*/g++ ${REALBASE}/*bin*/cc ${REALBASE}/*bin*/gcc
--
GitLab