summaryrefslogtreecommitdiff
path: root/binary/mingw/build-dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-02-11 07:49:46 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-02-11 07:49:46 +0200
commit0b23a3f3b097d89be0a0221e32dd3a970c188df3 (patch)
treee519ba4efa960bbe5aa72b4a1cc77a5f0939dd01 /binary/mingw/build-dist
parentc1cdd361cd15b1cb7167ae8aa333b80bb67f6536 (diff)
MinGW build update for GCC 4.7.2
Diffstat (limited to 'binary/mingw/build-dist')
-rwxr-xr-xbinary/mingw/build-dist14
1 files changed, 10 insertions, 4 deletions
diff --git a/binary/mingw/build-dist b/binary/mingw/build-dist
index a784fd6..aca3dcb 100755
--- a/binary/mingw/build-dist
+++ b/binary/mingw/build-dist
@@ -209,7 +209,7 @@ if [ $rebuild = y ]; then
../libcutl-configure
fi
-make
+make -j 10
cd ..
# Build odb
@@ -234,9 +234,9 @@ if [ $rebuild = y ]; then
../odb-configure $over
fi
-make
+make -j 10
make install-strip
-rm -f $install_root/bin/odb.a
+rm -r $install_root/libexec # odb/odb.a
cd ..
# Build gcc
@@ -250,7 +250,7 @@ else
rm -f gcc/cc1plus.exe gcc/cc1plus-dummy.exe
fi
-make STATIC_PLUGIN_LIBS="-Wl,--whole-archive $out_root/odb-build/odb/.libs/odb.a -Wl,--no-whole-archive $out_root/libcutl/cutl/.libs/libcutl.a -lstdc++ -static-libgcc"
+make STATIC_PLUGIN_LIBS="-Wl,--whole-archive $out_root/odb-build/odb/.libs/odb.a -Wl,--no-whole-archive $out_root/libcutl/cutl/.libs/libcutl.a -lstdc++ -static-libgcc" -j 10
make install
make -C i686-mingw32/libstdc++-v3 install-strip
cd ..
@@ -259,6 +259,12 @@ cd ..
#
cp -r /mingw $install_root/
+# Move mingw/lib/gcc/i686-mingw32/libgcc_s_dw2-1.dll to mingw/bin/.
+#
+if [ -e $install_root/mingw/lib/gcc/i686-mingw32/libgcc_s_dw2-1.dll ]; then
+ mv $install_root/mingw/lib/gcc/i686-mingw32/libgcc_s_dw2-1.dll $install_root/mingw/bin/
+fi
+
# Move doc and man out of share/
#
rm -rf $install_root/doc $install_root/man