mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
* Use a Nix shell for gcc-wrapper and ld-wrapper.
svn path=/nixpkgs/trunk/; revision=875
This commit is contained in:
parent
12ae5363ea
commit
8ed9ea8b51
@ -39,6 +39,7 @@ mkGccWrapper () {
|
|||||||
sed \
|
sed \
|
||||||
-e "s^@gcc@^$src^g" \
|
-e "s^@gcc@^$src^g" \
|
||||||
-e "s^@out@^$out^g" \
|
-e "s^@out@^$out^g" \
|
||||||
|
-e "s^@bash@^$SHELL^g" \
|
||||||
< $gccWrapper > $dst
|
< $gccWrapper > $dst
|
||||||
chmod +x $dst
|
chmod +x $dst
|
||||||
}
|
}
|
||||||
@ -57,6 +58,7 @@ sed \
|
|||||||
-e "s^@out@^$out^g" \
|
-e "s^@out@^$out^g" \
|
||||||
-e "s^@ldflags@^$ldflags^g" \
|
-e "s^@ldflags@^$ldflags^g" \
|
||||||
-e "s^@ld@^$ldPath/ld^g" \
|
-e "s^@ld@^$ldPath/ld^g" \
|
||||||
|
-e "s^@bash@^$SHELL^g" \
|
||||||
< $ldWrapper > $out/bin/ld
|
< $ldWrapper > $out/bin/ld
|
||||||
chmod +x $out/bin/ld
|
chmod +x $out/bin/ld
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#! /bin/sh
|
#! @bash@ -e
|
||||||
|
|
||||||
if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
|
if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
|
||||||
. "$NIX_GCC_WRAPPER_START_HOOK"
|
. "$NIX_GCC_WRAPPER_START_HOOK"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#! /bin/sh
|
#! @bash@ -e
|
||||||
|
|
||||||
if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
|
if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
|
||||||
. "$NIX_LD_WRAPPER_START_HOOK"
|
. "$NIX_LD_WRAPPER_START_HOOK"
|
||||||
|
@ -3,5 +3,6 @@ export PATH=/usr/bin:/bin
|
|||||||
mkdir $out
|
mkdir $out
|
||||||
cat > $out/setup <<EOF
|
cat > $out/setup <<EOF
|
||||||
export PATH=/usr/bin:/bin
|
export PATH=/usr/bin:/bin
|
||||||
|
export SHELL=/bin/sh
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/setup
|
chmod +x $out/setup
|
||||||
|
Loading…
Reference in New Issue
Block a user