@R g++ is back. Added some more dependencies to rebuild automatically

This commit is contained in:
bebbo 2017-03-25 11:45:34 +01:00
parent 745cf493eb
commit 96920af364
2 changed files with 13 additions and 6 deletions

View File

@ -436,6 +436,8 @@ def checkstamps(name):
target = fill_in(name) target = fill_in(name)
target = target.replace('_', '-') target = target.replace('_', '-')
target = target.replace('/', '-') target = target.replace('/', '-')
if not path.exists('{stamps}'):
mkdir('{stamps}')
stamp = path.join('{stamps}', target + '-make') stamp = path.join('{stamps}', target + '-make')
info('checking %s with %s', name, stamp) info('checking %s with %s', name, stamp)
mtime = 0 mtime = 0

View File

@ -89,9 +89,10 @@ def install_ndk():
@recipe('headers-install') @recipe('headers-install')
def 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('{prefix}/{target}/ndk/include', '{prefix}/{target}/libnix/include')
copytree('submodules/libnix/sources/headers', '{prefix}/{target}/libnix/include')
@recipe('fd2sfd-install') @recipe('fd2sfd-install')
@ -360,6 +361,10 @@ def _build(pull):
if checkstamps('{libnix}'): if checkstamps('{libnix}'):
removemodule('{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}'): if checkstamps('{clib2}'):
removemodule('{clib2}') removemodule('{clib2}')
@ -508,16 +513,16 @@ def _build(pull):
'--host=i686-linux-gnu', '--host=i686-linux-gnu',
'--build=i686-linux-gnu', '--build=i686-linux-gnu',
'--target=m68k-amigaos', '--target=m68k-amigaos',
'--enable-languages=c', '--enable-languages=c,c++',
'--enable-version-specific-runtime-libs', '--enable-version-specific-runtime-libs',
'--disable-libssp', '--disable-libssp',
'--with-headers={sources}/{ixemul}/include', '--with-headers={sources}/{ixemul}/include',
from_dir='{submodules}/{gcc}') from_dir='{submodules}/{gcc}')
touch_genfiles('{submodules}/{gcc}') touch_genfiles('{submodules}/{gcc}')
make('{gcc}', 'all-gcc', make('{gcc}', 'all-gcc',
MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast')
make('{gcc}', 'install-gcc', make('{gcc}', 'install-gcc',
MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul') MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast')
headers_install() headers_install()
@ -539,8 +544,8 @@ def _build(pull):
make('{libnix}', 'install') make('{libnix}', 'install')
with env(CC=CC, CXX=CXX, CFLAGS=FLAGS, CXXFLAGS=FLAGS): with env(CC=CC, CXX=CXX, CFLAGS=FLAGS, CXXFLAGS=FLAGS):
make('{gcc}', 'all-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') make('{gcc}', 'install-target-libgcc', MAKEINFO='makeinfo', CFLAGS_FOR_TARGET='-noixemul -Ofast')
copy('{submodules}/{libnix}/sources/headers/stabs.h', copy('{submodules}/{libnix}/sources/headers/stabs.h',
'{prefix}/{target}/libnix/include') '{prefix}/{target}/libnix/include')