From 244d0b418111ee051b8873e69a1dcab3baf54bf4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Aug 2003 07:22:16 +0000 Subject: [PATCH] * Stdenv-native uses the native build tools of the system. svn path=/nixpkgs/trunk/; revision=242 --- pkgs/stdenv-native/stdenv-build.sh | 26 ++++++++++++++++++++++++++ pkgs/stdenv-native/stdenv.fix | 7 +++++++ pkgs/stdenv/stdenv.fix | 1 + 3 files changed, 34 insertions(+) create mode 100755 pkgs/stdenv-native/stdenv-build.sh create mode 100644 pkgs/stdenv-native/stdenv.fix create mode 100644 pkgs/stdenv/stdenv.fix diff --git a/pkgs/stdenv-native/stdenv-build.sh b/pkgs/stdenv-native/stdenv-build.sh new file mode 100755 index 00000000000..3c084a34ea6 --- /dev/null +++ b/pkgs/stdenv-native/stdenv-build.sh @@ -0,0 +1,26 @@ +#! /bin/sh + +export PATH=/bin:/usr/bin + +mkdir $out || exit 1 +mkdir $out/bin || exit 1 + +echo "export PATH=$out/bin:/bin:/usr/bin" >> $out/setup || exit 1 + +gcc=/usr/bin/gcc + +sed \ + -e s^@GCC\@^$gcc^g \ + < $gccwrapper > $out/bin/gcc || exit 1 +chmod +x $out/bin/gcc || exit 1 + +ln -s gcc $out/bin/cc + +gplusplus=/usr/bin/g++ + +sed \ + -e s^@GCC\@^$gplusplus^g \ + < $gccwrapper > $out/bin/g++ || exit 1 +chmod +x $out/bin/g++ || exit 1 + +ln -s g++ $out/bin/c++ diff --git a/pkgs/stdenv-native/stdenv.fix b/pkgs/stdenv-native/stdenv.fix new file mode 100644 index 00000000000..bd7548d763e --- /dev/null +++ b/pkgs/stdenv-native/stdenv.fix @@ -0,0 +1,7 @@ +Package( + [ ("name", "stdenv-native") + , ("build", Relative("stdenv-native/stdenv-build.sh")) + + , ("gccwrapper", Relative("stdenv-linux/gcc-wrapper.sh")) + ] +) diff --git a/pkgs/stdenv/stdenv.fix b/pkgs/stdenv/stdenv.fix new file mode 100644 index 00000000000..714dac98cc6 --- /dev/null +++ b/pkgs/stdenv/stdenv.fix @@ -0,0 +1 @@ +IncludeFix("stdenv-native/stdenv.fix")