mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
* gcc-apple fixes for darwin
svn path=/nixpkgs/trunk/; revision=16452
This commit is contained in:
parent
869c2efec0
commit
b05906055a
@ -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() {
|
||||
|
Loading…
Reference in New Issue
Block a user