-echo "*** Building library..."
-echo "GhcWithHscBuiltViaC=NO" >>mk/build.mk
-$MAKE -C ghc/lib clean boot all || exit 1
-$MAKE -C hslibs clean boot all
+echo "*** Building libraries..."
+./configure
+
+# clean in ghc/lib, but avoid removing hsc2hs-generated .hs files
+$MAKE -C ghc/lib clean HSC_SRCS=""
+$MAKE -C ghc/lib boot all
+
+$MAKE -C hslibs clean boot all
+$MAKE -C ghc/utils clean boot all