build fixes

2 files changed, 7 insertions, 3 deletions

diff --git a/configure b/configure
index ed64d23..8157eaa 100755
--- a/configure
+++ b/configure
@@ -13,8 +13,8 @@ c.dsymutil.required()
 settings.add_setting_option('imaon2', '--with-imaon2', 'path to imaon2 (optional)', '')
 settings.add_setting_option('gen_dia', '--enable-recompile-dia', 'generate darwin-inject-asm.S', False, bool=True)
 settings.add_setting_option('enable_tests', '--enable-tests', 'tests!', False, bool=True)
-settings.add_setting_option('enable_ios_bootstrap', '--enable-ios-bootstrap', 'default: true if you pass --xcode-sdk=iphoneos',
-    lambda: 'iphoneos' in str(settings.host_machine().toolchains()[0].sdk_opt.value),
+settings.add_setting_option('enable_ios_bootstrap', '--enable-ios-bootstrap', 'default: true if you pass --xcode-sdk=iphone*',
+    lambda: 'iphone' in str(settings.host_machine().toolchains()[0].sdk_opt.value),
     bool=True)
 settings.add_setting_option('enable_werror', '--enable-werror', '', False, bool=True)
 
@@ -56,6 +56,9 @@ if settings.enable_werror:
     for mach in machs + [settings.host_machine()]:
         settings[mach.name].cflags = ['-Werror'] + settings[mach.name].cflags
 
+for i in ('cflags', 'ldflags'):
+    settings.host[i] = ['-miphoneos-version-min=8.0'] + settings.host[i]
+
 # todo make overridable?
 cc_argv = c.cc.argv()
 if 'armv7' in cc_argv or 'arm64' in cc_argv:
@@ -205,6 +208,7 @@ if settings.enable_ios_bootstrap:
     emitter.add_command(settings, ['(out)/safety-dance/SafetyDance.app/Info.plist'], ['(src)/darwin-bootstrap/safety-dance/Info.plist'], ['plutil -convert binary1 -o (outs[0]) (ins[0])'])
     for out in ['Default.png', 'Default@2x.png']:
         emitter.add_command(settings, ['(out)/safety-dance/SafetyDance.app/'+out], ['(src)/darwin-bootstrap/safety-dance/white.png'], ['cp (ins[0]) (outs[0])'])
+    emitter.add_command(settings, ['safety-dance'], list(filter(lambda out: '/safety-dance/' in out, emitter.all_outs)), [], phony=True)
 
     ls = ['(out)/libsubstitute.dylib']
     for ty, out, ins, objs, ldf, cf in [
diff --git a/script/mconfig.py b/script/mconfig.py
index 88e5341..9b37089 100644
--- a/script/mconfig.py
+++ b/script/mconfig.py
@@ -1085,7 +1085,7 @@ def build_c_objs(emitter, machine, settings, sources, headers=[], settings_cb=No
         include_args = ['-I'+_expand(inc) for inc in my_settings.c_includes]
         mach_settings = my_settings[machine.name]
         dbg = ['-g'] if mach_settings.debug_info else []
-        cflags = _expand_argv(get_else_and(my_settings, 'override_cflags', lambda: (mach_settings.cxxflags if is_cxx else mach_settings.cflags)))
+        cflags = _expand_argv(get_else_and(my_settings, 'override_cflags', lambda: mach_settings.cppflags + (mach_settings.cxxflags if is_cxx else mach_settings.cflags)))
         cc = _expand_argv(get_else_and(my_settings, 'override_cc', lambda: (tools.cxx if is_cxx else tools.cc).argv()))
         extra_deps = list(map(_expand, my_settings.get('extra_compile_deps', [])))
         any_was_cxx = any_was_cxx or is_cxx