1 files changed, 25 insertions, 21 deletions
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
index 50e2918c..02be4dda 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.morph
@@ -8,30 +8,34 @@ configure-commands:
 #   1. An attempt to stop anything going in $PREFIX/lib64 (which doesn't
 #      fully work; we will need to hobble the multilib configuration in
 #      config/i386/t-linux64 if we really want to kill /lib64).
-#   2. Multilib does not make sense in Baserock.
-#   3. Optimisation libraries which for now we do without.
-#   4. Recommended by Linux From Scratch; required for C++ ABI
-#      compatibility with other Linux distributions.
-#   5. MPFR is built in the GCC tree, we need to locate it.
-#   6. Avoid having more than one copy of ZLib in use on the system
+#   2. Avoid having more than one copy of ZLib in use on the system
+#   3. Multilib does not make sense in Baserock.
 - |
-  cd o && \
-  ../configure \
-    $(../morph-arch-config) \
-    --prefix="$PREFIX" \
-    `# [1]` --libdir=$PREFIX/lib \
-    --disable-nls \
-    --enable-languages=c,c++,fortran \
-    --enable-shared --enable-threads=posix \
-    `# [2]` --disable-multilib \
-    `# [3]` --disable-libgomp --without-cloog --without-ppl \
-    `# [4]` --enable-__cxa_atexit \
-    `# [5]` --with-mpfr-include="$(pwd)/../mpfr/src" \
-            --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
-    `# [6]` --with-system-zlib
+  case "$MORPH_ARCH" in
+      armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \
+                            --with-cpu=cortex-a9 \
+                            --with-tune=cortex-a9 \
+                            --with-fpu=vfpv3-d16 \
+                            --with-float=hard" ;;
+      armv7*)   ARCH_FLAGS="--with-arch=armv7-a" ;;
+  esac
+
+  cd o && ../configure                                        \
+            $ARCH_FLAGS                                       \
+            --prefix="$PREFIX"                                \
+    `# [1]` --libdir=$PREFIX/lib                              \
+            --disable-bootstrap                               \
+    `# [2]` --with-system-zlib                                \
+    `# [3]` --disable-multilib                                \
+            --enable-languages=c,c++,fortran
 
 build-commands:
-- cd o && make
+- |
+  case "$MORPH_ARCH" in
+      armv7*)   sed -i "s/--host=none/--host=armv7a/" o/Makefile
+                sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
+  esac
+  cd o && make
 
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install