From 96920af36494dfaa9469113c97e911bdce59a11b Mon Sep 17 00:00:00 2001 From: bebbo Date: Sat, 25 Mar 2017 11:45:34 +0100 Subject: [PATCH] @R g++ is back. Added some more dependencies to rebuild automatically --- common.py | 2 ++ toolchain-m68k | 17 +++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/common.py b/common.py index 1fb789e..2699b68 100644 --- a/common.py +++ b/common.py @@ -436,6 +436,8 @@ def checkstamps(name): target = fill_in(name) target = target.replace('_', '-') target = target.replace('/', '-') + if not path.exists('{stamps}'): + mkdir('{stamps}') stamp = path.join('{stamps}', target + '-make') info('checking %s with %s', name, stamp) mtime = 0 diff --git a/toolchain-m68k b/toolchain-m68k index cf1a06c..a0755ba 100755 --- a/toolchain-m68k +++ b/toolchain-m68k @@ -89,9 +89,10 @@ def install_ndk(): @recipe('headers-install') def headers_install(): - info('installing ixemul header files') + info('installing libnix + NDK header files') copytree('{prefix}/{target}/ndk/include', '{prefix}/{target}/libnix/include') + copytree('submodules/libnix/sources/headers', '{prefix}/{target}/libnix/include') @recipe('fd2sfd-install') @@ -360,6 +361,10 @@ def _build(pull): if checkstamps('{libnix}'): removemodule('{libnix}') + rmtree(path.join('{build}', '{gcc}', '{target}')) + for f in glob(path.join('{stamps}', '{gcc}' + '-make*')): + remove(f) + remove(path.join('{stamps}', 'headers-install')) if checkstamps('{clib2}'): removemodule('{clib2}') @@ -508,16 +513,16 @@ def _build(pull): '--host=i686-linux-gnu', '--build=i686-linux-gnu', '--target=m68k-amigaos', - '--enable-languages=c', + '--enable-languages=c,c++', '--enable-version-specific-runtime-libs', '--disable-libssp', '--with-headers={sources}/{ixemul}/include', from_dir='{submodules}/{gcc}') touch_genfiles('{submodules}/{gcc}') make('{gcc}', 'all-gcc', - MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') + MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast') make('{gcc}', 'install-gcc', - MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') + MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast') headers_install() @@ -539,8 +544,8 @@ def _build(pull): make('{libnix}', 'install') with env(CC=CC, CXX=CXX, CFLAGS=FLAGS, CXXFLAGS=FLAGS): - make('{gcc}', 'all-target-libgcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') - make('{gcc}', 'install-target-libgcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') + make('{gcc}', 'all-target-libgcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast') + make('{gcc}', 'install-target-libgcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast') copy('{submodules}/{libnix}/sources/headers/stabs.h', '{prefix}/{target}/libnix/include')