Commit 2fbc18f3 authored by Eloy Durán's avatar Eloy Durán

Merge pull request #2786 from CocoaPods/xcodeproj

[Rakefile] Remove old references to compiling Xcodeproj
parents 33452e26 29b83ac9
...@@ -22,23 +22,12 @@ task :bootstrap, [:use_bundle_dir?] => [:check_requirements] do |_t, args| ...@@ -22,23 +22,12 @@ task :bootstrap, [:use_bundle_dir?] => [:check_requirements] do |_t, args|
puts "Updating submodules" puts "Updating submodules"
execute_command "git submodule update --init --recursive" execute_command "git submodule update --init --recursive"
require 'rbconfig'
if RbConfig::CONFIG['prefix'] == '/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr'
# Workaround Apple's mess. See https://github.com/CocoaPods/Xcodeproj/issues/137
#
# TODO This is not as correct as actually fixing the issue, figure out if we
# can override these build flags:
#
# ENV['DLDFLAGS'] = '-undefined dynamic_lookup -multiply_defined suppress'
ENV['ARCHFLAGS'] = '-Wno-error=unused-command-line-argument-hard-error-in-future'
end
if system('which bundle') if system('which bundle')
puts "Installing gems" puts "Installing gems"
if args[:use_bundle_dir?] if args[:use_bundle_dir?]
execute_command "env XCODEPROJ_BUILD=1 bundle install --path ./travis_bundle_dir" execute_command "env bundle install --path ./travis_bundle_dir"
else else
execute_command "env XCODEPROJ_BUILD=1 bundle install" execute_command "env bundle install"
end end
else else
$stderr.puts "\033[0;31m" \ $stderr.puts "\033[0;31m" \
......
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