Call 'morph-arch-config' correctly

6 files changed, 6 insertions, 6 deletions

diff --git a/gcc.morph b/gcc.morph
index 0e5b0f937c..a8b5f7430a 100644
--- a/gcc.morph
+++ b/gcc.morph
@@ -3,7 +3,7 @@
     "kind": "chunk",
     "configure-commands": [
         "mkdir o",
-        "cd o && \\\n../configure \\\n  $(morph-arch-config) \\\n  --prefix=\"$PREFIX\" \\\n  `# [1]` --libdir=$PREFIX/lib \\\n  --disable-nls \\\n  --enable-languages=c,c++ --enable-shared --enable-threads=posix \\\n  `# [2]` --disable-multilib \\\n  `# [3]` --disable-libgomp --without-cloog --without-ppl \\\n  `# [4]` --enable-__cxa_atexit \\\n  `# [5]` --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n          --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n  `# [6]` --with-system-zlib\n"
+        "cd o && \\\n../configure \\\n  $(./morph-arch-config) \\\n  --prefix=\"$PREFIX\" \\\n  `# [1]` --libdir=$PREFIX/lib \\\n  --disable-nls \\\n  --enable-languages=c,c++ --enable-shared --enable-threads=posix \\\n  `# [2]` --disable-multilib \\\n  `# [3]` --disable-libgomp --without-cloog --without-ppl \\\n  `# [4]` --enable-__cxa_atexit \\\n  `# [5]` --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n          --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n  `# [6]` --with-system-zlib\n"
     ],
     "build-commands": [
         "cd o && make"
diff --git a/gcc.morph.yaml b/gcc.morph.yaml
index fb5a293c72..fb3cb95a06 100644
--- a/gcc.morph.yaml
+++ b/gcc.morph.yaml
@@ -17,7 +17,7 @@ configure-commands:
     - |
       cd o && \
       ../configure \
-        $(morph-arch-config) \
+        $(./morph-arch-config) \
         --prefix="$PREFIX" \
         `# [1]` --libdir=$PREFIX/lib \
         --disable-nls \
diff --git a/stage1-gcc.morph b/stage1-gcc.morph
index bd353b1a80..d209412228 100644
--- a/stage1-gcc.morph
+++ b/stage1-gcc.morph
@@ -3,7 +3,7 @@
     "kind": "chunk",
     "configure-commands": [
         "mkdir o",
-        "cd o &&\n../configure \\\n  $(morph-arch-config) \\\n  --build=$(sh ../config.guess) --host=$(sh ../config.guess) \\\n  --target=$TARGET_STAGE1 \\\n  --prefix=\"$PREFIX\" \\\n  --disable-bootstrap --disable-nls \\\n  `# [1]` --libdir=\"$PREFIX/lib\" --disable-multilib --disable-libgomp \\\n          --without-cloog --without-ppl \\\n          --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n          --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n  `# [2]` --with-local-prefix=\"$PREFIX\" \\\n  `# [3]` --with-native-system-header-dir=\"$PREFIX/include\" \\\n  `# [4]` --enable-languages=c --disable-decimal-float \\\n          --disable-libmudflap --disable-libquadmath --disable-libssp \\\n          --disable-shared --disable-threads --disable-target-libiberty \\\n          --disable-target-zlib --without-headers --with-newlib \\\n          --with-system-zlib\n"
+        "cd o &&\n../configure \\\n  $(./morph-arch-config) \\\n  --build=$(sh ../config.guess) --host=$(sh ../config.guess) \\\n  --target=$TARGET_STAGE1 \\\n  --prefix=\"$PREFIX\" \\\n  --disable-bootstrap --disable-nls \\\n  `# [1]` --libdir=\"$PREFIX/lib\" --disable-multilib --disable-libgomp \\\n          --without-cloog --without-ppl \\\n          --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n          --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n  `# [2]` --with-local-prefix=\"$PREFIX\" \\\n  `# [3]` --with-native-system-header-dir=\"$PREFIX/include\" \\\n  `# [4]` --enable-languages=c --disable-decimal-float \\\n          --disable-libmudflap --disable-libquadmath --disable-libssp \\\n          --disable-shared --disable-threads --disable-target-libiberty \\\n          --disable-target-zlib --without-headers --with-newlib \\\n          --with-system-zlib\n"
     ],
     "build-commands": [
         "cd o && make"
diff --git a/stage1-gcc.morph.yaml b/stage1-gcc.morph.yaml
index d641962cd6..23cd1af7c5 100644
--- a/stage1-gcc.morph.yaml
+++ b/stage1-gcc.morph.yaml
@@ -17,7 +17,7 @@ configure-commands:
     - |
       cd o &&
       ../configure \
-        $(morph-arch-config) \
+        $(./morph-arch-config) \
         --build=$(sh ../config.guess) --host=$(sh ../config.guess) \
         --target=$TARGET_STAGE1 \
         --prefix="$PREFIX" \
diff --git a/stage2-gcc.morph b/stage2-gcc.morph
index 59d20a3838..352a87b26f 100644
--- a/stage2-gcc.morph
+++ b/stage2-gcc.morph
@@ -5,7 +5,7 @@
         "stage2-eglibc-fix-specs",
         "cat \"gcc/limitx.h\" \"gcc/glimits.h\" \"gcc/limity.h\" > limits.h.tmp\nlibgcc_dir=$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))\ncp limits.h.tmp \"$libgcc_dir/include-fixed/limits.h\"\n",
         "mkdir o",
-        "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\ncd o && ../configure \\\n  $(morph-arch-config) \\\n  `# [1]` --build=$(sh ../config.guess) \\\n          --host=$TARGET_STAGE1 \\\n          --target=$TARGET_STAGE1 \\\n  --prefix=\"$PREFIX\" \\\n  `# [2]` --with-local-prefix=$PREFIX \\\n  `# [3]` --with-build-sysroot=\"$STAGE2_SYSROOT\" \\\n  --disable-bootstrap \\\n  --enable-clocale=gnu --enable-shared --enable-threads=posix \\\n  `# [4]` --enable-languages=c \\\n  `# [5]` --libdir=$PREFIX/lib \\\n          --disable-libgomp --disable-multilib --disable-nls \\\n          --without-cloog --without-ppl \\\n          --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n          --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n          --with-system-zlib\n"
+        "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\ncd o && ../configure \\\n  $(./morph-arch-config) \\\n  `# [1]` --build=$(sh ../config.guess) \\\n          --host=$TARGET_STAGE1 \\\n          --target=$TARGET_STAGE1 \\\n  --prefix=\"$PREFIX\" \\\n  `# [2]` --with-local-prefix=$PREFIX \\\n  `# [3]` --with-build-sysroot=\"$STAGE2_SYSROOT\" \\\n  --disable-bootstrap \\\n  --enable-clocale=gnu --enable-shared --enable-threads=posix \\\n  `# [4]` --enable-languages=c \\\n  `# [5]` --libdir=$PREFIX/lib \\\n          --disable-libgomp --disable-multilib --disable-nls \\\n          --without-cloog --without-ppl \\\n          --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n          --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n          --with-system-zlib\n"
     ],
     "build-commands": [
         "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\ncd o && make\n"
diff --git a/stage2-gcc.morph.yaml b/stage2-gcc.morph.yaml
index 7514beb40e..7926927438 100644
--- a/stage2-gcc.morph.yaml
+++ b/stage2-gcc.morph.yaml
@@ -41,7 +41,7 @@ configure-commands:
       export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
       export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
       cd o && ../configure \
-        $(morph-arch-config) \
+        $(./morph-arch-config) \
         `# [1]` --build=$(sh ../config.guess) \
                 --host=$TARGET_STAGE1 \
                 --target=$TARGET_STAGE1 \