From f54bc4e22fc636a2edcb6d5c1b198c7e5c894328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= <krystian.baclawski@gmail.com>
Date: Wed, 2 Sep 2015 22:44:01 +0200
Subject: [PATCH] Make m68k-amigaos build faster by 20%.

---
 toolchain-m68k | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/toolchain-m68k b/toolchain-m68k
index 04e43c7..71d4bbe 100755
--- a/toolchain-m68k
+++ b/toolchain-m68k
@@ -296,10 +296,10 @@ def build():
               '--host=i686-linux-gnu',
               '--build=i686-linux-gnu',
               '--target=m68k-amigaos',
-              '--enable-languages=c',
+              '--enable-languages=c,c++',
               '--with-headers={sources}/{ixemul}/include')
-  make('{gcc}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
-  make('{gcc}', 'install', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
+  make('{gcc}', 'all-gcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
+  make('{gcc}', 'install-gcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
 
   unpack('fd2sfd')
   patch('fd2sfd')
@@ -348,21 +348,8 @@ def build():
   make('{libm}')
   make('{libm}', 'install')
 
-  with cwd('{sources}'):
-    remove('{gpp}')
-    symlink('{gcc}', '{gpp}')
-
-  with env(CC=environ['CC'] + ' -std=gnu89',
-           CXX=environ['CXX'] + ' -std=gnu++98'):
-    configure('{gpp}',
-              '--prefix={target}',
-              '--host=i686-linux-gnu',
-              '--build=i686-linux-gnu',
-              '--target=m68k-amigaos',
-              '--enable-languages=c++',
-              '--with-headers={sources}/{ixemul}/include')
-  make('{gpp}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
-  make('{gpp}', 'install', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
+  make('{gcc}', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
+  make('{gcc}', 'install', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul')
 
 
 def clean():