* Fix "cgo" binary be defining LC_ALL=C inside the binary.
svn path=/nixpkgs/trunk/; revision=18350
This commit is contained in:
parent
a61a4bc4bc
commit
66ef37d260
@ -0,0 +1,13 @@
|
|||||||
|
diff -r 21cae7efdcc6 src/cmd/cgo/main.go
|
||||||
|
--- a/src/cmd/cgo/main.go Sat Nov 14 12:23:24 2009 -0800
|
||||||
|
+++ b/src/cmd/cgo/main.go Sun Nov 15 00:00:09 2009 +0100
|
||||||
|
@@ -52,6 +52,9 @@
|
||||||
|
fatal("unknown architecture %s", arch)
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Define the language of gcc error messages.
|
||||||
|
+ os.Setenv("LC_ALL", "C");
|
||||||
|
+
|
||||||
|
p := openProg(input);
|
||||||
|
for _, cref := range p.Crefs {
|
||||||
|
// Convert C.ulong to C.unsigned long, etc.
|
@ -20,6 +20,7 @@ stdenv.mkDerivation {
|
|||||||
patches = [
|
patches = [
|
||||||
./disable-system-dependent-tests.patch
|
./disable-system-dependent-tests.patch
|
||||||
./pkg-log-test-accept-period-in-file-path.patch
|
./pkg-log-test-accept-period-in-file-path.patch
|
||||||
|
./cgo-set-local-to-match-gcc-error-messages.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
@ -33,9 +34,6 @@ stdenv.mkDerivation {
|
|||||||
GOOS = "linux";
|
GOOS = "linux";
|
||||||
GOARCH = "386";
|
GOARCH = "386";
|
||||||
|
|
||||||
# The go-c interface depends on the error output of GCC.
|
|
||||||
LC_ALL = "C";
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir "$out"
|
ensureDir "$out"
|
||||||
ensureDir "$out/bin"
|
ensureDir "$out/bin"
|
||||||
|
Loading…
Reference in New Issue
Block a user