Commit 6a194e9d authored by Hugo Tunius's avatar Hugo Tunius

[Installer] Change default setting for ARC from being disabled via

CLANG_ENABLE_OBJC_ARC='NO' on a project basis with -fobjc-arc for each
file to enable ARC on a project basis with CLANG_ENABLE_OBJC_ARC='YES' and using -fno-objc-arc for each file in pods that don't require ARC
parent 3253d72c
...@@ -378,7 +378,7 @@ module Pod ...@@ -378,7 +378,7 @@ module Pod
build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO' build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'NO' build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
end end
end end
end end
......
...@@ -154,8 +154,9 @@ module Pod ...@@ -154,8 +154,9 @@ module Pod
# #
def compiler_flags_for_consumer(consumer) def compiler_flags_for_consumer(consumer)
flags = consumer.compiler_flags.dup flags = consumer.compiler_flags.dup
if consumer.requires_arc if !consumer.requires_arc
flags << '-fobjc-arc' flags << '-fno-objc-arc'
else
platform_name = consumer.platform_name platform_name = consumer.platform_name
spec_deployment_target = consumer.spec.deployment_target(platform_name) spec_deployment_target = consumer.spec.deployment_target(platform_name)
if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name] if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name]
......
Subproject commit 517f42bd10bcefdc89803c6a1656d4009758eee1 Subproject commit d3da15278e302d66af81a809483e5b287055908d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment