* Resolve symlinks to the standard libraries as suggested by Andreas Faerber.
Fixes #5744. * Removed commented obsolete code. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36355 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
43f42779be
commit
3f9f9f9aee
20
configure
vendored
20
configure
vendored
@ -184,23 +184,33 @@ standard_gcc_settings()
|
|||||||
$headers/$d"
|
$headers/$d"
|
||||||
done
|
done
|
||||||
|
|
||||||
# when not building the crosscompiler, to use cpp headers from
|
# Unset the HAIKU_{SHARED,STATIC}_LIB{STD,SUP}CXX variables, if the
|
||||||
# tree first, but fallback to local C++ system headers (like <new>)
|
# compiler didn't give us actual file names. Otherwise resolve
|
||||||
# if [ "$buildCrossTools" = "" ]; then
|
# symlinks to avoid problems when copying the libraries to the
|
||||||
# HAIKU_CXX_HEADERS_DIR="headers/cpp $HAIKU_CXX_HEADERS_DIR"
|
# image.
|
||||||
# fi
|
|
||||||
|
|
||||||
if [ $HAIKU_STATIC_LIBSTDCXX = libstdc++.a ]; then
|
if [ $HAIKU_STATIC_LIBSTDCXX = libstdc++.a ]; then
|
||||||
HAIKU_STATIC_LIBSTDCXX=
|
HAIKU_STATIC_LIBSTDCXX=
|
||||||
|
else
|
||||||
|
HAIKU_STATIC_LIBSTDCXX=`readlink -e $HAIKU_STATIC_LIBSTDCXX`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $HAIKU_SHARED_LIBSTDCXX = libstdc++.so ]; then
|
if [ $HAIKU_SHARED_LIBSTDCXX = libstdc++.so ]; then
|
||||||
HAIKU_SHARED_LIBSTDCXX=
|
HAIKU_SHARED_LIBSTDCXX=
|
||||||
|
else
|
||||||
|
HAIKU_SHARED_LIBSTDCXX=`readlink -e $HAIKU_SHARED_LIBSTDCXX`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $HAIKU_STATIC_LIBSUPCXX = libsupc++.a ]; then
|
if [ $HAIKU_STATIC_LIBSUPCXX = libsupc++.a ]; then
|
||||||
HAIKU_STATIC_LIBSUPCXX=
|
HAIKU_STATIC_LIBSUPCXX=
|
||||||
|
else
|
||||||
|
HAIKU_STATIC_LIBSUPCXX=`readlink -e $HAIKU_STATIC_LIBSUPCXX`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $HAIKU_SHARED_LIBSUPCXX = libsupc++.so ]; then
|
if [ $HAIKU_SHARED_LIBSUPCXX = libsupc++.so ]; then
|
||||||
HAIKU_SHARED_LIBSUPCXX=
|
HAIKU_SHARED_LIBSUPCXX=
|
||||||
|
else
|
||||||
|
HAIKU_SHARED_LIBSUPCXX=`readlink -e $HAIKU_SHARED_LIBSUPCXX`
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
2.9*)
|
2.9*)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user