Explorar o código

Toolchain: Build fix for macOS

Unfortunately their sed behaves a tiny bit different to how
GNU sed does.
Gunnar Beutner %!s(int64=4) %!d(string=hai) anos
pai
achega
c60f02fbc2
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      Toolchain/BuildIt.sh

+ 6 - 2
Toolchain/BuildIt.sh

@@ -78,7 +78,11 @@ GCC_BASE_URL="http://ftp.gnu.org/gnu/gcc"
 buildstep() {
 buildstep() {
     NAME=$1
     NAME=$1
     shift
     shift
-    "$@" 2>&1 | sed 's|^|\x1b[34m['"${NAME}"']\x1b[39m |'
+    if [ "$(uname -s)" = "Darwin" ]; then
+        "$@" 2>&1 | sed 's|^|['"${NAME}"'] |'
+    else
+        "$@" 2>&1 | sed 's|^|\x1b[34m['"${NAME}"']\x1b[39m |'
+    fi
 }
 }
 
 
 # === CHECK CACHE AND REUSE ===
 # === CHECK CACHE AND REUSE ===
@@ -269,7 +273,7 @@ pushd "$DIR/Build/$ARCH"
 
 
             cp $DIR/Tarballs/gcc-$GCC_VERSION/gcc/config/serenity-kernel.h $DIR/Tarballs/gcc-$GCC_VERSION/gcc/config/serenity.h
             cp $DIR/Tarballs/gcc-$GCC_VERSION/gcc/config/serenity-kernel.h $DIR/Tarballs/gcc-$GCC_VERSION/gcc/config/serenity.h
             if [ "$STAGE" = "Userland" ]; then
             if [ "$STAGE" = "Userland" ]; then
-                sed -i 's@-fno-exceptions @@' $DIR/Tarballs/gcc-$GCC_VERSION/gcc/config/serenity.h
+                sed -i='' 's@-fno-exceptions @@' $DIR/Tarballs/gcc-$GCC_VERSION/gcc/config/serenity.h
             fi
             fi
 
 
             buildstep "gcc/configure/${STAGE,,}" "$DIR/Tarballs/gcc-$GCC_VERSION/configure" --prefix="$PREFIX" \
             buildstep "gcc/configure/${STAGE,,}" "$DIR/Tarballs/gcc-$GCC_VERSION/configure" --prefix="$PREFIX" \