2008-06-26 12:20:33 +02:00
|
|
|
source $stdenv/setup
|
|
|
|
|
|
|
|
|
|
|
|
export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
|
|
|
|
mkdir $NIX_FIXINC_DUMMY
|
|
|
|
|
|
|
|
|
|
|
|
# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
|
|
|
|
# Thing.
|
|
|
|
export CPP="gcc -E"
|
|
|
|
|
|
|
|
|
|
|
|
if test "$noSysDirs" = "1"; then
|
|
|
|
|
|
|
|
if test -e $NIX_GCC/nix-support/orig-libc; then
|
|
|
|
|
|
|
|
# Figure out what extra flags to pass to the gcc compilers
|
|
|
|
# being generated to make sure that they use our glibc.
|
|
|
|
extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
|
|
|
|
extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"
|
|
|
|
|
|
|
|
# Use *real* header files, otherwise a limits.h is generated
|
|
|
|
# that does not include Glibc's limits.h (notably missing
|
|
|
|
# SSIZE_MAX, which breaks the build).
|
|
|
|
export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
|
|
|
|
|
|
|
|
else
|
|
|
|
# Hack: support impure environments.
|
|
|
|
extraCFlags="-isystem /usr/include"
|
|
|
|
extraLDFlags="-L/usr/lib64 -L/usr/lib"
|
|
|
|
export NIX_FIXINC_DUMMY=/usr/include
|
|
|
|
fi
|
|
|
|
|
2009-11-15 17:48:36 +01:00
|
|
|
|
2008-06-26 12:20:33 +02:00
|
|
|
extraCFlags="-g0 -I$gmp/include -I$mpfr/include $extraCFlags"
|
|
|
|
extraLDFlags="--strip-debug $extraLDFlags"
|
|
|
|
|
|
|
|
export NIX_EXTRA_CFLAGS=$extraCFlags
|
|
|
|
for i in $extraLDFlags; do
|
|
|
|
export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
|
|
|
|
done
|
|
|
|
|
Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
Maybe we should have a single stdenv and forget about the stdenvCross
adapter - this could end in a stdenv a bit complex, but simpler than the
generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
now works for both the cross and the native compilers, but I think this
should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
its manual, so the derivation still fails. Guile requires patching to
cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
derivation variables mixed with those of the stdenvCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 20:51:45 +01:00
|
|
|
if test -n "$targetConfig"; then
|
2009-11-15 17:48:36 +01:00
|
|
|
if test -z "$crossStageStatic"; then
|
2009-12-08 10:36:19 +01:00
|
|
|
extraXCFlags="-B${libcCross}/lib -idirafter ${libcCross}/include"
|
|
|
|
extraXLDFlags="-L${libcCross}/lib"
|
2009-11-15 17:48:36 +01:00
|
|
|
export NIX_EXTRA_CFLAGS_TARGET=$extraXCFlags
|
|
|
|
for i in $extraXLDFlags; do
|
|
|
|
export NIX_EXTRA_LDFLAGS_TARGET="$NIX_EXTRA_LDFLAGS_TARGET -Wl,$i"
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
|
|
makeFlagsArray=( \
|
|
|
|
"${makeFlagsArray[@]}" \
|
|
|
|
NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
|
|
|
|
SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
|
|
|
|
CFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS_TARGET $NIX_EXTRA_LDFLAGS_TARGET" \
|
|
|
|
LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS_TARGET $NIX_EXTRA_LDFLAGS_TARGET" \
|
|
|
|
)
|
|
|
|
else
|
|
|
|
export NIX_EXTRA_CFLAGS_TARGET=$NIX_EXTRA_CFLAGS
|
|
|
|
export NIX_EXTRA_LDFLAGS_TARGET=$NIX_EXTRA_LDFLAGS
|
|
|
|
makeFlagsArray=( \
|
|
|
|
"${makeFlagsArray[@]}" \
|
|
|
|
NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
|
|
|
|
SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
|
2009-11-15 18:48:10 +01:00
|
|
|
CFLAGS_FOR_BUILD="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
|
|
|
|
CFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
|
2009-11-15 17:48:36 +01:00
|
|
|
LDFLAGS_FOR_BUILD="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
|
2009-11-15 18:48:10 +01:00
|
|
|
LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \
|
2009-11-15 17:48:36 +01:00
|
|
|
)
|
|
|
|
fi
|
2009-11-15 06:28:35 +01:00
|
|
|
|
Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
Maybe we should have a single stdenv and forget about the stdenvCross
adapter - this could end in a stdenv a bit complex, but simpler than the
generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
now works for both the cross and the native compilers, but I think this
should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
its manual, so the derivation still fails. Guile requires patching to
cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
derivation variables mixed with those of the stdenvCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 20:51:45 +01:00
|
|
|
if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
|
2009-11-15 06:28:35 +01:00
|
|
|
# We don't want the gcc build to assume there will be a libc providing
|
|
|
|
# limits.h in this stagae
|
|
|
|
makeFlagsArray=( \
|
|
|
|
"${makeFlagsArray[@]}" \
|
|
|
|
LIMITS_H_TEST=false \
|
|
|
|
)
|
|
|
|
else
|
|
|
|
makeFlagsArray=( \
|
|
|
|
"${makeFlagsArray[@]}" \
|
|
|
|
LIMITS_H_TEST=true \
|
|
|
|
)
|
|
|
|
fi
|
2008-06-26 12:20:33 +02:00
|
|
|
fi
|
|
|
|
|
Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
Maybe we should have a single stdenv and forget about the stdenvCross
adapter - this could end in a stdenv a bit complex, but simpler than the
generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
now works for both the cross and the native compilers, but I think this
should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
its manual, so the derivation still fails. Guile requires patching to
cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
derivation variables mixed with those of the stdenvCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 20:51:45 +01:00
|
|
|
if test -n "$targetConfig"; then
|
2009-11-17 00:21:13 +01:00
|
|
|
# The host strip will destroy everything in the target binaries otherwise
|
2009-11-15 06:28:35 +01:00
|
|
|
dontStrip=1
|
|
|
|
fi
|
2008-06-26 12:20:33 +02:00
|
|
|
|
|
|
|
preConfigure() {
|
|
|
|
# Perform the build in a different directory.
|
|
|
|
mkdir ../build
|
|
|
|
cd ../build
|
|
|
|
configureScript=../$sourceRoot/configure
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
postInstall() {
|
|
|
|
# Remove precompiled headers for now. They are very big and
|
|
|
|
# probably not very useful yet.
|
|
|
|
find $out/include -name "*.gch" -exec rm -rf {} \; -prune
|
|
|
|
|
|
|
|
# Remove `fixincl' to prevent a retained dependency on the
|
|
|
|
# previous gcc.
|
|
|
|
rm -rf $out/libexec/gcc/*/*/install-tools
|
|
|
|
rm -rf $out/lib/gcc/*/*/install-tools
|
|
|
|
|
|
|
|
# Get rid of some "fixed" header files
|
|
|
|
rm -rf $out/lib/gcc/*/*/include/root
|
|
|
|
|
|
|
|
# Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
|
|
|
|
for i in $out/bin/*-gcc*; do
|
|
|
|
if cmp -s $out/bin/gcc $i; then
|
|
|
|
ln -sfn gcc $i
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
for i in $out/bin/*-c++* $out/bin/*-g++*; do
|
|
|
|
if cmp -s $out/bin/g++ $i; then
|
|
|
|
ln -sfn g++ $i
|
|
|
|
fi
|
|
|
|
done
|
2009-12-22 00:02:06 +01:00
|
|
|
|
|
|
|
eval "$postInstallGhdl"
|
2008-06-26 12:20:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler
got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
Maybe we should have a single stdenv and forget about the stdenvCross
adapter - this could end in a stdenv a bit complex, but simpler than the
generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
now works for both the cross and the native compilers, but I think this
should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
its manual, so the derivation still fails. Guile requires patching to
cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
derivation variables mixed with those of the stdenvCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
2009-11-22 20:51:45 +01:00
|
|
|
if test -z "$targetConfig"; then
|
My first attempt at getting cross compilers in nixpkgs.
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter,
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:
bashRealArm = makeOverridable (import ../shells/bash) {
inherit fetchurl bison;
stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};
Meanwhile it does not work - I still cannot get the cross-gcc to build.
I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.
I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...
I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.
This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.
I cared not to break anything of the usual stdenv in all this work.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
2009-11-14 09:11:30 +01:00
|
|
|
if test -z "$profiledCompiler"; then
|
|
|
|
buildFlags="bootstrap $buildFlags"
|
|
|
|
else
|
|
|
|
buildFlags="profiledbootstrap $buildFlags"
|
|
|
|
fi
|
2009-11-15 06:28:35 +01:00
|
|
|
else
|
|
|
|
:
|
|
|
|
# buildFlags="all-gcc all-target-libgcc $buildFlags"
|
|
|
|
# installTargets="install-gcc install-target-libgcc"
|
2008-06-26 12:20:33 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
genericBuild
|