* gcc-apple fixes for darwin

svn path=/nixpkgs/trunk/; revision=16452
This commit is contained in:
Rob Vermaas 2009-07-24 12:28:39 +00:00
parent 869c2efec0
commit b05906055a

View File

@ -67,7 +67,7 @@ preConfigure() {
cd ../build cd ../build
configureScript=../$sourceRoot/configure configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs --disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib" configureFlags="--enable-languages=$langs --disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib --with-gxx-include-dir=${STDCXX_INCDIR}"
} }
@ -85,6 +85,8 @@ postUnpack() {
mv libstdcxx-16/libstdcxx $sourceRoot/ mv libstdcxx-16/libstdcxx $sourceRoot/
} }
STDCXX_INCDIR="$out/include/c++/4.2.1"
genericBuild genericBuild
@ -103,7 +105,7 @@ preConfigure() {
ln -s ../build/gcc gcc ln -s ../build/gcc gcc
configureScript=../$sourceRoot/libstdcxx/configure configureScript=../$sourceRoot/libstdcxx/configure
configureFlags="--disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib" configureFlags="--disable-libstdcxx-pch --disable-libstdcxx-debug --disable-multilib --with-gxx-include-dir=${STDCXX_INCDIR}"
} }
unpackPhase () { unpackPhase () {
@ -112,6 +114,8 @@ unpackPhase () {
postInstall() { postInstall() {
echo '-' echo '-'
echo "cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/"
cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/
} }
patchPhase() { patchPhase() {