1 files changed, 30 insertions, 17 deletions
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph
index e342d648..d1246d26 100644
--- a/strata/build-essential/stage2-gcc.morph
+++ b/strata/build-essential/stage2-gcc.morph
@@ -3,27 +3,40 @@ kind: chunk
 configure-commands:
 - mkdir o
 - |
+  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
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
-  export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
-  cd o && ../configure \
-    $(../morph-arch-config) \
-    `# [1]` --build=$(sh ../config.guess) \
-            --host=$TARGET_STAGE1 \
-            --target=$TARGET_STAGE1 \
-    --prefix="$PREFIX" \
-    `# [2]` --with-local-prefix=$PREFIX \
-    `# [3]` --with-build-sysroot="$STAGE2_SYSROOT" \
-    --disable-bootstrap \
-    --enable-clocale=gnu --enable-shared --enable-threads=posix \
-    `# [4]` --enable-languages=c \
-    `# [5]` --libdir=$PREFIX/lib \
-            --disable-libgomp --disable-multilib --disable-nls \
-            --without-cloog --without-ppl \
-            --with-mpfr-include="$(pwd)/../mpfr/src" \
-            --with-mpfr-lib="$(pwd)/mpfr/src/.libs"
+  export CXX="$TARGET_STAGE1-g++ --sysroot=$STAGE2_SYSROOT"
+  export AR="$TARGET_STAGE1-ar"
+  export RANLIB="$TARGET_STAGE1-ranlib"
+  cd o && ../configure                                         \
+            $ARCH_FLAGS                                        \
+            --build=$(sh ../config.guess)                      \
+    `# [1]` --host=$TARGET_STAGE1                              \
+    `# [1]` --target=$TARGET_STAGE1                            \
+            --prefix="$PREFIX"                                 \
+    `# [2]` --libdir=$PREFIX/lib                               \
+    `# [3]` --with-local-prefix=$PREFIX                        \
+    `# [4]` --with-build-sysroot="$STAGE2_SYSROOT"             \
+            --disable-bootstrap                                \
+            --disable-nls                                      \
+            --disable-multilib                                 \
+            --disable-libgomp                                  \
+            --disable-libstdcxx-pch                            \
+            --enable-languages=c,c++
 build-commands:
 - |
+  case "$MORPH_ARCH" in
+      armv7*)   sed -i "s/--host=none/--host=armv7a/" o/Makefile
+                sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
+  esac
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   cd o && make
 install-commands: