Add support for custom Xcode location (#1273)

2018-01-30 15:04:29 +03:00
parent 19cc8c6bee
commit c09fd4d355
10 changed files with 181 additions and 39 deletions
@@ -210,10 +210,7 @@ class HelperNativeDep extends TgzNativeDep {

 enum DependencyKind {
    LLVM(            "llvm",            { it.llvmHome },       { "llvmDir" }        ),
-    GCC_TOOLCHAIN(   "gccToolchain",    { (it instanceof LinuxBasedConfigurables) ? it.gccToolchain : null },   { "gccToolchainDir" }),
-    SYSROOT(         "sysroot",         { it.targetSysRoot }                        ),
-    LIBFFI(          "libffi",          { it.libffiDir }                            ),
-    TARGET_TOOLCHAIN("targetToolchain", { it.targetToolchain }                      )
+    LIBFFI(          "libffi",          { it.libffiDir }                            )


    DependencyKind(String name,
@@ -241,7 +238,8 @@ enum DependencyKind {
 }

 TargetManager.enabled.each { target ->
-    def konanProperties = new KonanPropertiesLoader(target,
+    def konanProperties = ConfigurablesImplKt.loadConfigurables(
+            target,
            rootProject.ext.konanProperties,
            rootProject.ext.dependenciesDir.canonicalPath
    )