diff options
| author | Arwed von Merkatz | 2009-10-16 18:28:49 +0200 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-10-20 20:33:36 +0200 |
| commit | 1456d52fba50fb8e684498851caf989f7da8b710 (patch) | |
| tree | 83f2c1721ccebcc6e7786b7ece3fb27b35258410 | |
| parent | 721a35d0b0d42ce11eedd992b488fd96e0d82ea9 (diff) | |
g++: don't fail casting if persistent vars are not there
(cherry picked from commit 53bf2b1b86471afeab002a92d60f4624f5a5103d)
| -rwxr-xr-x | gnu/g++/DEPENDS | 6 | ||||
| -rw-r--r-- | gnu/g++/HISTORY | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/g++/DEPENDS b/gnu/g++/DEPENDS index 071293e5b9..db054db9a0 100755 --- a/gnu/g++/DEPENDS +++ b/gnu/g++/DEPENDS @@ -7,7 +7,7 @@ depends mpfr && depends smgl-archspecs && if spell_ok gcc; then - persistent_read gcc GCC_BUILD_ARCH GCC_BUILD_ARCH + persistent_read gcc GCC_BUILD_ARCH GCC_BUILD_ARCH || true fi && if [[ $VERSION != $(installed_version gcc) @@ -16,10 +16,10 @@ if [[ $VERSION != $(installed_version gcc) 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/g++/HISTORY b/gnu/g++/HISTORY index 1485b8395e..e14764b6e3 100644 --- a/gnu/g++/HISTORY +++ b/gnu/g++/HISTORY @@ -1,3 +1,6 @@ +2009-10-16 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: don't fail if persistent vars 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. |