support for XCode8

lib/curl_builder.rb

@@ -60,9 +60,9 @@ module CurlBuilder
     verbose:            false,
     debug_symbols:      false,
     curldebug:          false,
-    sdk_version:        "9.3",
-    osx_sdk_version:    "10.11",
-    libcurl_version:    "7.49.1",
+    sdk_version:        "11.2",
+    osx_sdk_version:    "10.13",
+    libcurl_version:    "7.57.0",
     architectures:      %w(i386 armv7 armv7s arm64 x86_64),
     xcode_home:         "/Applications/Xcode.app/Contents/Developer",
     run_on_dir:         Dir::pwd,

lib/curl_builder/compiler.rb

@@ -67,7 +67,7 @@ def platform_for(architecture)
 
     def tools_for(platform)
       {
-        cc:     find_tool("gcc", platform),
+        cc:     find_tool("clang", platform),
         ld:     find_tool("ld", platform),
         ar:     find_tool("ar", platform),
         as:     find_tool("as", platform),
@@ -96,18 +96,18 @@ def compilation_flags_for(platform, architecture)
         version = "6.0"
         min_version = "-miphoneos-version-min=#{version}"
       elsif platform == "iPhoneOS"
-        version = architecture == "arm64" ? "6.0" : "5.0"
+        version = architecture == "arm64" ? "7.0" : "6.0"
         min_version = "-miphoneos-version-min=#{version}"
       else
-        min_version = "-mmacosx-version-min=10.7"
+        min_version = "-mmacosx-version-min=10.8"
       end
 
       sdk_version = sdk_version_for platform
       sdk = "#{setup(:xcode_home)}/Platforms/#{platform}.platform/Developer/SDKs/#{platform}#{sdk_version}.sdk"
 
       {
-        ldflags: "-arch #{architecture} -pipe -isysroot #{sdk}",
-        cflags:  "-arch #{architecture} -pipe -isysroot #{sdk} #{min_version}"
+        ldflags: "-arch #{architecture} -isysroot #{sdk}",
+        cflags:  "-arch #{architecture} -pipe -Os -gdwarf-2 -isysroot #{sdk} #{min_version} -fembed-bitcode -Werror=partial-availability"
       }
     end
 

lib/curl_builder/packer.rb

@@ -21,7 +21,7 @@ def pack(compiled_architectures)
       info { "Packing binaries for architectures '#{param(compiled_architectures.join(" "))}'..." }
 
       osx = setup(:osx_sdk_version) != "none" ? compiled_architectures.select { |arch| arch.match(/^x86_64/) } : []
-      ios = compiled_architectures - osx
+      ios = compiled_architectures
       arm = ios.select { |arch| arch.match(/^arm/) }
       arm64 = ios.select { |arch| arch.match(/^arm64/) }
 
@@ -33,6 +33,7 @@ def pack(compiled_architectures)
       end
 
       if create_binary_for ios, "ios-dev"
+        # Fix: now iPhone simulator may also use x86_64
         successful["ios-dev"] = ios
         copy_include_dir ios.first, "ios-dev"
       end