[haiku-commits] r36355 - haiku/trunk
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 19 Apr 2010 18:29:23 +0200 (CEST)
Author: bonefish
Date: 2010-04-19 18:29:23 +0200 (Mon, 19 Apr 2010)
New Revision: 36355
Changeset: http://dev.haiku-os.org/changeset/36355/haiku
Ticket: http://dev.haiku-os.org/ticket/5744
Modified:
haiku/trunk/configure
Log:
* Resolve symlinks to the standard libraries as suggested by Andreas Faerber.
Fixes #5744.
* Removed commented obsolete code.
Modified: haiku/trunk/configure
===================================================================
--- haiku/trunk/configure 2010-04-19 15:35:39 UTC (rev 36354)
+++ haiku/trunk/configure 2010-04-19 16:29:23 UTC (rev 36355)
@@ -184,23 +184,33 @@
$headers/$d"
done
- # when not building the crosscompiler, to use cpp
headers from
- # tree first, but fallback to local C++ system headers
(like <new>)
- # if [ "$buildCrossTools" = "" ]; then
- # HAIKU_CXX_HEADERS_DIR="headers/cpp
$HAIKU_CXX_HEADERS_DIR"
- # fi
+ # Unset the HAIKU_{SHARED,STATIC}_LIB{STD,SUP}CXX
variables, if the
+ # compiler didn't give us actual file names. Otherwise
resolve
+ # symlinks to avoid problems when copying the libraries
to the
+ # image.
if [ $HAIKU_STATIC_LIBSTDCXX = libstdc++.a ]; then
HAIKU_STATIC_LIBSTDCXX=
+ else
+ HAIKU_STATIC_LIBSTDCXX=`readlink -e
$HAIKU_STATIC_LIBSTDCXX`
fi
+
if [ $HAIKU_SHARED_LIBSTDCXX = libstdc++.so ]; then
HAIKU_SHARED_LIBSTDCXX=
+ else
+ HAIKU_SHARED_LIBSTDCXX=`readlink -e
$HAIKU_SHARED_LIBSTDCXX`
fi
+
if [ $HAIKU_STATIC_LIBSUPCXX = libsupc++.a ]; then
HAIKU_STATIC_LIBSUPCXX=
+ else
+ HAIKU_STATIC_LIBSUPCXX=`readlink -e
$HAIKU_STATIC_LIBSUPCXX`
fi
+
if [ $HAIKU_SHARED_LIBSUPCXX = libsupc++.so ]; then
HAIKU_SHARED_LIBSUPCXX=
+ else
+ HAIKU_SHARED_LIBSUPCXX=`readlink -e
$HAIKU_SHARED_LIBSUPCXX`
fi
;;
2.9*)
Other related posts:
- » [haiku-commits] r36355 - haiku/trunk - ingo_weinhold
