summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormabrand <mabrand@mabrand.nl>2016-10-02 17:52:40 (GMT)
committerGitHub <noreply@github.com>2016-10-02 17:52:40 (GMT)
commit649768833c5ea98bbe9ceec795192bbbee8d9e95 (patch)
tree9a731af062a87a9ce8013ec55a547a6c488010fd
parenta2a2f65262cfb356b5ce6ac411d5f9398786f090 (diff)
parentc2012dc3288057bc3912d33c7f1d82bf9266532e (diff)
downloadmxe-649768833c5ea98bbe9ceec795192bbbee8d9e95.zip
mxe-649768833c5ea98bbe9ceec795192bbbee8d9e95.tar.gz
mxe-649768833c5ea98bbe9ceec795192bbbee8d9e95.tar.bz2
Merge pull request #1528 from LuaAndC/s-environmental-environment
s/environmental variable/environment variable/
-rw-r--r--docs/index.html2
-rw-r--r--plugins/go/go-1-fixes.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/index.html b/docs/index.html
index 4e8d318..0e9a271 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3466,7 +3466,7 @@ endef</pre>
finished porting all packages that were MinGW-only to at least
i686-w64-mingw32 (32-bit target of MinGW-w64). Hence your existing
commands should work out-of-the-box assuming the
- <code>MXE_TARGETS</code> environmental variable is set correctly.
+ <code>MXE_TARGETS</code> environment variable is set correctly.
</p>
</dd>
diff --git a/plugins/go/go-1-fixes.patch b/plugins/go/go-1-fixes.patch
index 4c02676..a192caf 100644
--- a/plugins/go/go-1-fixes.patch
+++ b/plugins/go/go-1-fixes.patch
@@ -5,10 +5,10 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 25 Jun 2016 13:51:06 +0200
-Subject: [PATCH] cgo: add environmental variable override for pkg-config
+Subject: [PATCH] cgo: add environment variable override for pkg-config
Allow overriding default name of `pkg-config` utility via
-environmental variable PKG_CONFIG (same as used by autoconf
+environment variable PKG_CONFIG (same as used by autoconf
pkg.m4 macros). This facilitates easy cross-compilation of cgo
code.