summaryrefslogtreecommitdiff
path: root/binary/mingw-w64/build-dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-02-11 16:20:56 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-02-11 16:23:49 +0200
commit6fe7fc56873b27deef74bc9dc36adf86af4fd79b (patch)
treeab6794c3f6ac2202ebf9f5e2f24cd4f0886fc68e /binary/mingw-w64/build-dist
parentbe44ee078fa5d5470dddd097db0d97fadfc754ff (diff)
Update MinGW64 binary build (MinGW 3.3 runtime)
Using GCC 4.9.3, multi-arch/multi-lib build (you don't want to try this at home).
Diffstat (limited to 'binary/mingw-w64/build-dist')
-rwxr-xr-xbinary/mingw-w64/build-dist23
1 files changed, 20 insertions, 3 deletions
diff --git a/binary/mingw-w64/build-dist b/binary/mingw-w64/build-dist
index 5b8e1f0..0c1e082 100755
--- a/binary/mingw-w64/build-dist
+++ b/binary/mingw-w64/build-dist
@@ -90,6 +90,9 @@ if [ $rebuild = y ]; then
cp -r mingw-rt/* /mingw/
cp -r mingw-binutils/* /mingw/
+
+ mkdir /mingw/mingw
+ ln -s /mingw/i686-w64-mingw32/lib64 /mingw/mingw/lib
fi
# Build libplugin-stub
@@ -251,17 +254,30 @@ else
fi
make -j $jobs 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"
+
+# Split 32 and 64 libs/dlls.
+#
+rm -rf /mingw/bin64
+mv /mingw/bin /mingw/bin32
make install
-make -C i686-w64-mingw32/libstdc++-v3 install-strip
+make -C i686-w64-mingw32/libstdc++-v3/src install-strip
+mv /mingw/bin/* /mingw/bin32/
+rm -rf /mingw/bin /mingw/bin64
+make -C i686-w64-mingw32/64/libstdc++-v3/src install-strip
+mv /mingw/bin /mingw/bin64
+mv /mingw/bin32 /mingw/bin
cd ..
-# Copy /mingw over to installation
+# Copy /mingw over to installation.
#
cp -r /mingw $install_root/
# Move some DLLs to mingw/bin/.
mv $install_root/mingw/lib/libgcc_s_sjlj-1.dll $install_root/mingw/bin/
-mv $install_root/mingw/i686-w64-mingw32/bin/libwinpthread-1.dll $install_root/mingw/bin/
+mv $install_root/mingw/i686-w64-mingw32/lib/libwinpthread-1.dll $install_root/mingw/bin/
+
+mv $install_root/mingw/lib64/libgcc_s_sjlj-1.dll $install_root/mingw/bin64/
+mv $install_root/mingw/i686-w64-mingw32/lib64/libwinpthread-1.dll $install_root/mingw/bin64/
# Move doc and man out of share/
#
@@ -272,6 +288,7 @@ rm -r $install_root/share
# Clean some things up.
#
+rm -r $install_root/mingw/mingw
rm -f $install_root/mingw/lib/libbfd.*
rm -f $install_root/mingw/include/bfd*.h
rm -f $install_root/mingw/lib/libopcodes.*