* Split off the native build init into setup-nativetools.sh.
* Add the $gcc/lib to the library path in the Nixified stdenv. (This include libgcc.so and libstdc++.so.) svn path=/nixpkgs/trunk/; revision=340gstqt5
parent
ce22795c1c
commit
3467585b1b
|
@ -0,0 +1,9 @@
|
||||||
|
export PATH=/usr/local/bin:/usr/bin:/bin
|
||||||
|
export SHELL=/bin/sh
|
||||||
|
|
||||||
|
. @BASEENV@/setup
|
||||||
|
|
||||||
|
export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
|
||||||
|
export NIX_LDFLAGS="-L@GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS"
|
||||||
|
export NIX_CC=/usr/bin/gcc
|
||||||
|
export NIX_CXX=/usr/bin/g++
|
|
@ -4,6 +4,6 @@ export SHELL=@SHELL@
|
||||||
. @BASEENV@/setup
|
. @BASEENV@/setup
|
||||||
|
|
||||||
export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
|
export NIX_CFLAGS="-isystem @GLIBC@/include $NIX_CFLAGS"
|
||||||
export NIX_LDFLAGS="-L @GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS"
|
export NIX_LDFLAGS="-L@GLIBC@/lib -Wl,-dynamic-linker,@GLIBC@/lib/ld-linux.so.2,-rpath,@GLIBC@/lib $NIX_LDFLAGS -L@GCC@/lib -Wl,-rpath,@GCC@/lib"
|
||||||
export NIX_CC=@CC@
|
export NIX_CC=@CC@
|
||||||
export NIX_CXX=@CXX@
|
export NIX_CXX=@CXX@
|
||||||
|
|
|
@ -23,6 +23,7 @@ echo "########## $p"
|
||||||
|
|
||||||
sed \
|
sed \
|
||||||
-e s^@GLIBC\@^$glibc^g \
|
-e s^@GLIBC\@^$glibc^g \
|
||||||
|
-e s^@GCC\@^$gcc^g \
|
||||||
-e s^@CC\@^$cc^g \
|
-e s^@CC\@^$cc^g \
|
||||||
-e s^@CXX\@^$cxx^g \
|
-e s^@CXX\@^$cxx^g \
|
||||||
-e s^@BASEENV\@^$baseenv^g \
|
-e s^@BASEENV\@^$baseenv^g \
|
||||||
|
|
|
@ -1,17 +1,9 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
export PATH=/bin:/usr/bin
|
export PATH=/usr/local/bin:/usr/bin:/bin
|
||||||
|
|
||||||
mkdir $out || exit 1
|
mkdir $out || exit 1
|
||||||
|
|
||||||
p='/usr/local/bin:/usr/bin:/bin'
|
|
||||||
|
|
||||||
cc=/usr/bin/gcc
|
|
||||||
cxx=/usr/bin/g++
|
|
||||||
shell=/bin/sh
|
|
||||||
|
|
||||||
echo "########## $p"
|
|
||||||
|
|
||||||
sed \
|
sed \
|
||||||
-e s^@GLIBC\@^$glibc^g \
|
-e s^@GLIBC\@^$glibc^g \
|
||||||
-e s^@CC\@^$cc^g \
|
-e s^@CC\@^$cc^g \
|
||||||
|
|
|
@ -2,7 +2,7 @@ Package(
|
||||||
[ ("name", "stdenv-linux")
|
[ ("name", "stdenv-linux")
|
||||||
, ("build", Relative("stdenv-linux/stdenv-nativetools-build.sh"))
|
, ("build", Relative("stdenv-linux/stdenv-nativetools-build.sh"))
|
||||||
|
|
||||||
, ("setup", Relative("stdenv-linux/setup.sh"))
|
, ("setup", Relative("stdenv-linux/setup-nativetools.sh"))
|
||||||
, ("baseenv", IncludeFix("baseenv/baseenv.fix"))
|
, ("baseenv", IncludeFix("baseenv/baseenv.fix"))
|
||||||
, ("glibc", IncludeFix("glibc/glibc.fix"))
|
, ("glibc", IncludeFix("glibc/glibc.fix"))
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue