From c8cc99203894c2464a7961b5e6bd8a46a25ed2d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Oct 2006 20:25:31 +0000 Subject: [PATCH] * Put a symlink to the assembler in the GCC wrapper. Otherwise, when we use the GCC wrapper in a user environment, the wrong assembler will be called. This is not usually a problem, but sometimes it is (e.g., when using G++ 4.1.1 with binutils 2.16 or so). svn path=/nixpkgs/trunk/; revision=6862 --- pkgs/build-support/gcc-wrapper/builder.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 20e15405526..e0f880d8df6 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -89,6 +89,12 @@ mkGccWrapper $out/bin/g77 $gccPath/g77 ln -s g77 $out/bin/f77 +# Create a symlink to as (the assembler). This is useful when a +# gcc-wrapper is installed in a user environment, as it ensures that +# the right assembler is called. +ln -s $nativePrefix/bin/as $out/bin/as + + # Make a wrapper around the linker. doSubstitute "$ldWrapper" "$out/bin/ld" chmod +x "$out/bin/ld"