[xcconfig] Always exlude `USE_HEADERMAP` from the user’s project. #1216

CHANGELOG.md

@@ -12,6 +12,9 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ###### Bug Fixes
 
+* Always exlude `USE_HEADERMAP` from the user’s project.
+  [#1216](https://github.com/CocoaPods/CocoaPods/issues/1216)
+
 * Use correct template repo when using the `pod lib create` command.
   [#1214](https://github.com/CocoaPods/CocoaPods/issues/1214)
 

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -28,6 +28,10 @@ module Pod
           end
         end
 
+        # TODO Need to decide how we are going to ensure settings like these
+        # are always excluded from the user's project.
+        @xcconfig.attributes.delete('USE_HEADERMAP')
+
         @xcconfig
       end
 

lib/cocoapods/installer.rb

@@ -453,7 +453,7 @@ module Pod
           executed = false
           libraries_using_spec(spec).each do |lib|
             lib_representation = library_rep(lib)
-            executed |= run_spec_pre_install_hook(spec, lib_representation)
+            executed ||= run_spec_pre_install_hook(spec, lib_representation)
           end
           UI.message "- #{spec.name}" if executed
         end
@@ -512,7 +512,7 @@ module Pod
           executed = false
           libraries_using_spec(spec).each do |lib|
             lib_representation = library_rep(lib)
-            executed |= run_spec_post_install_hook(spec, lib_representation)
+            executed ||= run_spec_post_install_hook(spec, lib_representation)
           end
           UI.message "- #{spec.name}" if executed
         end