Fix Swift static libary test specs

CHANGELOG.md

@@ -12,7 +12,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.  
+* Fix building Swift static library test specs.  
+  [Samuel Giddins](https://github.com/segiddins)
 
 
 ## 1.5.0.beta.1 (2018-03-23)

lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -357,7 +357,7 @@ module Pod
           end
 
           other_swift_flags = module_map_files.tap(&:uniq!).flat_map { |f| ['-Xcc', f] }
-          if target.is_a?(PodTarget) && !target.requires_frameworks? && target.defines_module?
+          if target.is_a?(PodTarget) && !target.requires_frameworks? && target.defines_module? && !test_xcconfig
             # make it possible for a mixed swift/objc static library to be able to import the objc from within swift
             other_swift_flags += ['-import-underlying-module', '-Xcc', '-fmodule-map-file="${SRCROOT}/${MODULEMAP_FILE}"']
           end

cocoapods-integration-specs @ e0ba219c

-Subproject commit a0d94ce49fc8fc49048830bda60e10132190934e
+Subproject commit e0ba219ce2b04a7799c55543e008498b414b34be