summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-27 12:05:34 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-04-27 12:05:34 +0000
commitede1bee20b4b69b1c57565d6c82eb58527dfadd7 (patch)
treec039da635618f9d11e598b7f48abb6d8d3ee0dc5
parentccfe94d5e52c7e1f6278c73700eddd3d5bba623f (diff)
[toolchain] gcc: fix getenv() patches for 4.4.7 and 4.5-linaro
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31489 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch14
-rw-r--r--toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch2
2 files changed, 15 insertions, 1 deletions
diff --git a/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
new file mode 100644
index 0000000000..359c577397
--- /dev/null
+++ b/toolchain/gcc/patches/4.4.7/920-specs_nonfatal_getenv.patch
@@ -0,0 +1,14 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -7855,7 +7855,10 @@ getenv_spec_function (int argc, const ch
+
+ value = getenv (argv[0]);
+ if (!value)
+- fatal ("environment variable \"%s\" not defined", argv[0]);
++ {
++ error ("warning: environment variable \"%s\" not defined", argv[0]);
++ value = "";
++ }
+
+ /* We have to escape every character of the environment variable so
+ they are not interpreted as active spec characters. A
diff --git a/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch
index 6fd659c04f..001088a25c 100644
--- a/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch
+++ b/toolchain/gcc/patches/4.5-linaro/920-specs_nonfatal_getenv.patch
@@ -6,7 +6,7 @@
if (!value)
- fatal ("environment variable \"%s\" not defined", argv[0]);
+ {
-+ warning (0, "environment variable \"%s\" not defined", argv[0]);
++ error ("warning: environment variable \"%s\" not defined", argv[0]);
+ value = "";
+ }