Skip to content
Snippets Groups Projects
Commit 7e121466 authored by Ray Garcia's avatar Ray Garcia :scream_cat:
Browse files

push-pop LIBRARY_PATH workaround for gcc

parent 0bb97b59
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment