summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2009-10-16 18:27:35 +0200
committerArwed von Merkatz2009-10-20 20:33:22 +0200
commit721a35d0b0d42ce11eedd992b488fd96e0d82ea9 (patch)
treed4c1923b9989b79645e147f32a1e762d80f88d95
parent3e32de8cc9d800fefed552959aa69f280c59874e (diff)
gcc: don't fail casting if persistent vars are not there
(cherry picked from commit f28094f3d365878787a2c5578a478f9a961a0194)
-rwxr-xr-xgnu/gcc/DEPENDS4
-rw-r--r--gnu/gcc/HISTORY4
2 files changed, 6 insertions, 2 deletions
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 7faab02267..2bd4edbfec 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -13,10 +13,10 @@ then
fi &&
if spell_ok gmp; then
- persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH
+ persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH || true
fi &&
if spell_ok mpfr; then
- persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH
+ persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH || true
fi &&
if [[ $GMP_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]}
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 254df83982..07c924e0a6 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,7 @@
+2009-10-16 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: don't fail if mpfr and gmp persistent variables are
+ not available, bug #15476
+
2009-09-06 Remko van der Vossen <wich@sourcemage.org>
* BUILD: Stop build if gmp or mpfr were built with a different archspec
than the current one.