From: Carl Hetherington <cth@carlh.net>
Date: Fri, 30 Nov 2012 00:40:35 +0000 (+0000)
Subject: Reworks various.
X-Git-Url: https://main.carlh.net/gitweb/?p=mingw-build.git;a=commitdiff_plain;h=e5d7dfbfc231cdcb4b79449e0ed9136696b75515

Reworks various.
---

diff --git a/.gitignore b/.gitignore
index 7d0044d..deb7485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 Archives
 binutils-2.23
-binutils-build-32
+binutils-build-*
 gcc-4.7.2
-gcc-build-32
-mingw-headers-build-32/
-mingw-runtime-build-32/
+gcc-build-*
+mingw-headers-build-*
+mingw-runtime-build-*
 mingw-w64-v2.0.7/
 *~
diff --git a/build_all b/build_all
new file mode 100755
index 0000000..70936be
--- /dev/null
+++ b/build_all
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+export MINGW_PREFIX=/mingw2
+export MINGW_PARALLEL="-j2"
+export MINGW_BUILD=i686-pc-linux-gnu
+
+export MINGW_TARGET=i686-w64-mingw32
+
+bash build_binutils.sh
+bash build_mingw_headers.sh
+bash build_gcc_core.sh
+bash build_mingw_runtime.sh
+bash build_gcc_rest.sh
+
+export MINGW_TARGET=x86_64-w64-mingw32
+
+bash build_binutils.sh
+bash build_mingw_headers.sh
+bash build_gcc_core.sh
+bash build_mingw_runtime.sh
+bash build_gcc_rest.sh
diff --git a/build_all.sh b/build_all.sh
deleted file mode 100644
index d35542b..0000000
--- a/build_all.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-bash build_binutils_32.sh
-bash build_mingw_headers_32.sh
-bash build_gcc_core_32.sh
-bash build_mingw_runtime_32.sh
-bash build_gcc_rest_32.sh
diff --git a/build_binutils.sh b/build_binutils.sh
new file mode 100644
index 0000000..dc97c16
--- /dev/null
+++ b/build_binutils.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+tar xzf Archives/binutils-2.23.tar.gz
+mkdir -p binutils-build-$MINGW_TARGET
+cd binutils-build-$MINGW_TARGET
+../binutils-2.23/configure --with-sysroot=$MINGW_PREFIX --prefix=$MINGW_PREFIX --disable-multilib -target=$MINGW_TARGET --enable-targets=$MINGW_TARGET 
+make $MINGW_PARALLEL
+sudo make install
+
diff --git a/build_binutils_32.sh b/build_binutils_32.sh
deleted file mode 100644
index d9fc874..0000000
--- a/build_binutils_32.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-tar xzf Archives/binutils-2.23.tar.gz
-mkdir -p binutils-build-32
-cd binutils-build-32
-../binutils-2.23/configure --with-sysroot=/mingw --prefix=/mingw --disable-multilib -target=i686-w64-mingw32 --enable-targets=i686-w64-mingw32 
-make -j3
-sudo make install
-
diff --git a/build_gcc_core.sh b/build_gcc_core.sh
new file mode 100644
index 0000000..0288d91
--- /dev/null
+++ b/build_gcc_core.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+tar xjf Archives/gcc-4.7.2.tar.bz2
+mkdir -p gcc-build-$MINGW_TARGET
+cd gcc-build-$MINGW_TARGET
+../gcc-4.7.2/configure --with-sysroot=$MINGW_PREFIX --prefix=$MINGW_PREFIX --disable-multilib --target=$MINGW_TARGET --with-gnu-ld --with-gnu-as --enable-fully-dynamic-string
+make $MINGW_PARALLEL all-gcc
+sudo make install-gcc
diff --git a/build_gcc_core_32.sh b/build_gcc_core_32.sh
deleted file mode 100644
index 08d5f7c..0000000
--- a/build_gcc_core_32.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash -e
-
-tar xjf Archives/gcc-4.7.2.tar.bz2
-mkdir -p gcc-build-32
-cd gcc-build-32
-../gcc-4.7.2/configure --with-sysroot=/mingw --prefix=/mingw --disable-multilib --target=i686-w64-mingw32 --with-gnu-ld --with-gnu-as --enable-fully-dynamic-string
-make -j3 all-gcc
-sudo make install-gcc
diff --git a/build_gcc_rest.sh b/build_gcc_rest.sh
new file mode 100644
index 0000000..c20c3a0
--- /dev/null
+++ b/build_gcc_rest.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+cd gcc-build-$MINGW_TARGET
+make $MINGW_PARALLEL
+sudo make install
diff --git a/build_gcc_rest_32.sh b/build_gcc_rest_32.sh
deleted file mode 100644
index 4acb9b9..0000000
--- a/build_gcc_rest_32.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-cd gcc-build-32
-make -j3
-sudo make install
diff --git a/build_mingw_headers.sh b/build_mingw_headers.sh
new file mode 100644
index 0000000..7f20b7a
--- /dev/null
+++ b/build_mingw_headers.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+tar xzf Archives/mingw-w64-v2.0.7.tar.gz
+mkdir -p mingw-headers-build-$MINGW_TARGET
+cd mingw-headers-build-$MINGW_TARGET
+../mingw-w64-v2.0.7/mingw-w64-headers/configure --prefix=$MINGW_PREFIX --build=$MINGW_BUILD --host=$MINGW_TARGET
+sudo make install
+sudo ln -s $MINGW_PREFIX/$MINGW_TARGET $MINGW_PREFIX/mingw
+sudo mkdir -p $MINGW_PREFIX/$MINGW_TARGET/lib
+sudo ln -s $MINGW_PREFIX/$MINGW_TARGET/lib $MINGW_PREFIX/$MINGW_TARGET/lib64
+
+
+
diff --git a/build_mingw_headers_32.sh b/build_mingw_headers_32.sh
deleted file mode 100644
index 26e63bc..0000000
--- a/build_mingw_headers_32.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-tar xzf Archives/mingw-w64-v2.0.7.tar.gz
-mkdir -p mingw-headers-build-32
-cd mingw-headers-build-32
-../mingw-w64-v2.0.7/mingw-w64-headers/configure --prefix=/mingw --build=i686-pc-linux-gnu --host=i686-w64-mingw32
-sudo make install
-sudo ln -s /mingw/i686-w64-mingw32 /mingw/mingw
-sudo mkdir -p /mingw/i686-w64-mingw32/lib
-sudo ln -s /mingw/i686-w64-mingw32/lib /mingw/i686-w64-mingw32/lib64
-
-
-
diff --git a/build_mingw_runtime.sh b/build_mingw_runtime.sh
new file mode 100644
index 0000000..542b880
--- /dev/null
+++ b/build_mingw_runtime.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+mkdir -p mingw-runtime-build-$MINGW_TARGET
+cd mingw-runtime-build-$MINGW_TARGET
+PATH=$PATH:$MINGW_PREFIX/bin ../mingw-w64-v2.0.7/mingw-w64-crt/configure --prefix=$MINGW_PREFIX --with-sysroot=$MINGW_PREFIX --host=$MINGW_TARGET
+PATH=$PATH:$MINGW_PREFIX/bin make $MINGW_PARALLEL
+sudo PATH=$PATH:$MINGW_PREFIX/bin make install
diff --git a/build_mingw_runtime_32.sh b/build_mingw_runtime_32.sh
deleted file mode 100644
index 2c88f99..0000000
--- a/build_mingw_runtime_32.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-mkdir -p mingw-runtime-build-32
-cd mingw-runtime-build-32
-PATH=$PATH:/mingw/bin ../mingw-w64-v2.0.7/mingw-w64-crt/configure --prefix=/mingw --with-sysroot=/mingw --host=i686-w64-mingw32
-PATH=$PATH:/mingw/bin make -j3
-sudo PATH=$PATH:/mingw/bin make install
-
-
-
diff --git a/config.sh b/config.sh
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/config.sh
@@ -0,0 +1 @@
+