From acb8963f7279d0a62ecc0b0eb9606de2e3977520 Mon Sep 17 00:00:00 2001
From: toshi0383 <t.suzuki326@gmail.com>
Date: Mon, 2 Oct 2017 15:02:07 +0900
Subject: [PATCH] Apply fix to func getCombinedBuildSettings

---
 Sources/XcodeGenKit/SettingsBuilder.swift | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Sources/XcodeGenKit/SettingsBuilder.swift b/Sources/XcodeGenKit/SettingsBuilder.swift
index d549d070..5cc62882 100644
--- a/Sources/XcodeGenKit/SettingsBuilder.swift
+++ b/Sources/XcodeGenKit/SettingsBuilder.swift
@@ -67,14 +67,22 @@ extension ProjectSpec {
                     buildSettings += configFile.flattenedBuildSettings()
                 }
             }
-            buildSettings += getProjectBuildSettings(config: config)
+            for (k, v) in getProjectBuildSettings(config: config) {
+                if buildSettings[k] == nil {
+                    buildSettings[k] = v
+                }
+            }
         }
         if let configFilePath = target.configFiles[config.name] {
             if let configFile = try? XCConfig(path: basePath + configFilePath) {
                 buildSettings += configFile.flattenedBuildSettings()
             }
         }
-        buildSettings += getTargetBuildSettings(target: target, config: config)
+        for (k, v) in getTargetBuildSettings(target: target, config: config) {
+            if buildSettings[k] == nil {
+                buildSettings[k] = v
+            }
+        }
         return buildSettings
     }