[Lunar-commits] <moonbase-core> glibc: removed the use of explicit 'exit 1'

Stefan Wold ratler at lunar-linux.org
Tue Nov 19 00:12:00 CET 2013


commit ada46d932838efb8bba8464bc32fd461fdb7c5a6
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Mon, 18 Nov 2013 12:44:26 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/ada46d932838efb8bba8464bc32fd461fdb7c5a6

glibc: removed the use of explicit 'exit 1'
---
  libs/glibc/BUILD        | +2/-4     
  libs/glibc/BUILD.x86_64 | +2/-2     
  2 files changed, 4 insertions(+), 6 deletions(-)

--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -41,9 +41,7 @@
                --enable-bind-now          \
                --enable-stackguard-randomization \
                $OPTS  &&
-
-  # explicitly exit here since the following code unsets $?
-  make || exit 1  &&
+  make &&
 
   # Preserve the old glibc temporarily
   LD=/lib/ld-linux.so.2         &&
@@ -136,7 +134,7 @@
 
   # Generate locale info
   if [ -z "$GLIBC_LOCALES" ]; then
-    make localedata/install-locales || exit 1
+    make localedata/install-locales
   else
     devoke_installwatch  &&
     for LOCALE in $GLIBC_LOCALES; do
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -42,7 +42,7 @@
                $OPTS  &&
 
   # explicitly exit here since the following code unsets $?
-  make || exit 1  &&
+  make &&
 
   # Preserve the old glibc temporarily
   LD=/lib/ld-linux-x86-64.so.2  &&
@@ -122,7 +122,7 @@
 
   # Generate locale info
   if [ -z "$GLIBC_LOCALES" ]; then
-    make localedata/install-locales || exit 1
+    make localedata/install-locales
   else
     devoke_installwatch  &&
     for LOCALE in $GLIBC_LOCALES; do




More information about the Lunar-commits mailing list