@B fix merge issues

common.py

@@ -534,7 +534,7 @@ def require_header(headers, lang='c', errmsg='', symbol=None, value=None):
   panic(errmsg)
 
 
-__all__ = ['setvar', 'panic', 'cmpver', 'find_executable', 'chmod', 'execute',
+__all__ = ['setvar', 'fill_in', 'panic', 'cmpver', 'find_executable', 'chmod', 'execute',
            'rmtree', 'mkdir', 'copy', 'copytree', 'unarc', 'fetch', 'cwd',
            'symlink', 'remove', 'move', 'find', 'textfile', 'env', 'path',
            'add_site_dir', 'find_site_dir', 'python_setup', 'recipe',

toolchain-m68k

@@ -85,12 +85,13 @@ def install_ndk():
     execute('sfdc', '--target=m68k-amigaos', '--mode=lvo',
             '--output={prefix}/{target}/ndk/include/lvo/%s_lib.i' % base, name)
 
+  copytree('{prefix}/{target}/ndk/include', '{prefix}/os-include')
 
 @recipe('headers-install')
 def headers_install():
   info('installing ixemul header files')
 
-#  copytree('{sources}/{ixemul}/include', '{prefix}/{target}/libnix/include')
+  copytree('{sources}/{ixemul}/include', '{prefix}/{target}/libnix/include')
 
 
 @recipe('fd2sfd-install')
@@ -290,8 +291,10 @@ def _build(pull):
 
   CC = find_executable(CC)
   CXX = find_executable(CXX)
-  FLAGS = '-g -Os'
-
+  
+  FLAGS = os.path.expandvars('$FLAGS')
+  if FLAGS == '$FLAGS':
+    FLAGS = '-g'
   if getLogger().isEnabledFor(logging.DEBUG):
     FLAGS += ' -Wall'
   else:
@@ -368,7 +371,7 @@ def _build(pull):
   unpack('{flex}')
   configure('{flex}', '--prefix={host}')
   # flex build is broken with multiple threads
-  nt = '{numThreads}'
+  nt = fill_in('{numThreads}')
   setvar(numThreads='1')
   make('{flex}')
   make('{flex}', 'install')