gcc: add "set -e" and make sure a build failure aborts the whole script.

1 files changed, 4 insertions, 14 deletions

diff --git a/d/gcc/gcc.SlackBuild b/d/gcc/gcc.SlackBuild
index 6aaaa73..ecadc68 100755
--- a/d/gcc/gcc.SlackBuild
+++ b/d/gcc/gcc.SlackBuild
@@ -288,6 +288,8 @@ for COMPILER in ${ALL_COMPILERS}; do
   fi
 done
 
+set -e
+
 cd $TMP
 tar xvf $CWD/gcc-$VERSION.tar.?z*
 # (cd gcc-$VERSION
@@ -302,7 +304,7 @@ tar xvf $CWD/gcc-$VERSION.tar.?z*
 
 # Copy ecj.jar into the TLD of the source. Needed for java compiler.
 # This can be retrieved from ftp://sourceware.org/pub/java
-cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar
+# cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar
 
 # Use an antlr runtime to compile javadoc.
 # The runtime can be obtained from:
@@ -365,10 +367,9 @@ if [ -n "${LIBDIRSUFFIX_TGT}" ]; then
 fi
 
 # build gcc
-{( mkdir gcc.build.lnx;
+  mkdir gcc.build.lnx;
   cd gcc.build.lnx;
 
-
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ../gcc-$VERSION/configure --prefix=/${PREFIX} --with-sysroot=/${PREFIX} \
@@ -535,17 +536,6 @@ fi
     fi
   )
 
-  ## build the txz package
-  #(
-  #  cd $PKG_GCC;
-  #  makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz
-  #)
-  # keep a log
-) 2>&1 && RES="true" || RES="false"; } | tee $TMP/gcc.build.log
-if ! ${RES}; then
-  exit 1
-fi
-
 # OK, time to split the big package where needed:
 
 # gcc-g++: