From b05906055a7c80fb46fb5ce89d6249766766d84b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 24 Jul 2009 12:28:39 +0000
Subject: [PATCH]  * gcc-apple fixes for darwin

svn path=/nixpkgs/trunk/; revision=16452
---
 pkgs/development/compilers/gcc-apple/builder.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc-apple/builder.sh
index 1e2d28dad86..1e4eccafbb2 100644
--- a/pkgs/development/compilers/gcc-apple/builder.sh
+++ b/pkgs/development/compilers/gcc-apple/builder.sh
@@ -67,7 +67,7 @@ preConfigure() {
     cd ../build
 
     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/
 }
 
+STDCXX_INCDIR="$out/include/c++/4.2.1"
+
 genericBuild
 
 
@@ -103,7 +105,7 @@ preConfigure() {
     ln -s ../build/gcc gcc
     
     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 () {
@@ -112,6 +114,8 @@ unpackPhase () {
 
 postInstall() {
   echo '-'
+  echo "cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/"
+  cp -v ${STDCXX_INCDIR}/*/bits/* ${STDCXX_INCDIR}/bits/
 }
 
 patchPhase() {