From 3467585b1baf9f3b0c0ac15b47f5de776ac22d1c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Aug 2003 13:42:21 +0000 Subject: [PATCH] * 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=340 --- pkgs/stdenv-linux/setup-nativetools.sh | 9 +++++++++ pkgs/stdenv-linux/setup.sh | 2 +- pkgs/stdenv-linux/stdenv-build.sh | 1 + pkgs/stdenv-linux/stdenv-nativetools-build.sh | 10 +--------- pkgs/stdenv-linux/stdenv-nativetools.fix | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 pkgs/stdenv-linux/setup-nativetools.sh diff --git a/pkgs/stdenv-linux/setup-nativetools.sh b/pkgs/stdenv-linux/setup-nativetools.sh new file mode 100644 index 00000000000..c1b4bc61026 --- /dev/null +++ b/pkgs/stdenv-linux/setup-nativetools.sh @@ -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++ diff --git a/pkgs/stdenv-linux/setup.sh b/pkgs/stdenv-linux/setup.sh index 396abf41c54..ce25963e912 100644 --- a/pkgs/stdenv-linux/setup.sh +++ b/pkgs/stdenv-linux/setup.sh @@ -4,6 +4,6 @@ export SHELL=@SHELL@ . @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_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_CXX=@CXX@ diff --git a/pkgs/stdenv-linux/stdenv-build.sh b/pkgs/stdenv-linux/stdenv-build.sh index 005a6f8043d..fdcd95a96fa 100755 --- a/pkgs/stdenv-linux/stdenv-build.sh +++ b/pkgs/stdenv-linux/stdenv-build.sh @@ -23,6 +23,7 @@ echo "########## $p" sed \ -e s^@GLIBC\@^$glibc^g \ + -e s^@GCC\@^$gcc^g \ -e s^@CC\@^$cc^g \ -e s^@CXX\@^$cxx^g \ -e s^@BASEENV\@^$baseenv^g \ diff --git a/pkgs/stdenv-linux/stdenv-nativetools-build.sh b/pkgs/stdenv-linux/stdenv-nativetools-build.sh index 3c0e61b2ba4..4b1d6d2d682 100755 --- a/pkgs/stdenv-linux/stdenv-nativetools-build.sh +++ b/pkgs/stdenv-linux/stdenv-nativetools-build.sh @@ -1,17 +1,9 @@ #! /bin/sh -export PATH=/bin:/usr/bin +export PATH=/usr/local/bin:/usr/bin:/bin 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 \ -e s^@GLIBC\@^$glibc^g \ -e s^@CC\@^$cc^g \ diff --git a/pkgs/stdenv-linux/stdenv-nativetools.fix b/pkgs/stdenv-linux/stdenv-nativetools.fix index 428d8cdebc4..5e1187b9d36 100644 --- a/pkgs/stdenv-linux/stdenv-nativetools.fix +++ b/pkgs/stdenv-linux/stdenv-nativetools.fix @@ -2,7 +2,7 @@ Package( [ ("name", "stdenv-linux") , ("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")) , ("glibc", IncludeFix("glibc/glibc.fix")) ]