mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Use --with-icu-dir everywhere but Ruby 2.0
--with-icu-dir is broken on Ruby 2.0 due to https://bugs.ruby-lang.org/issues/8074. Specifying --with-icu-include/--with-icu-lib is broken on Ruby 2.1 and newer due to https://github.com/bundler/bundler/pull/3338. So now we use --with-icu-dir everywhere but Ruby 2.0.
This commit is contained in:
		@@ -8,7 +8,14 @@ git fetch origin test/attributes:test/attributes
 | 
			
		||||
git fetch origin test/master:test/master
 | 
			
		||||
 | 
			
		||||
script/vendor-deb libicu48 libicu-dev
 | 
			
		||||
if ruby -e 'exit RUBY_VERSION >= "2.0" && RUBY_VERSION < "2.1"'; then
 | 
			
		||||
  # Workaround for https://bugs.ruby-lang.org/issues/8074. We can't use this
 | 
			
		||||
  # solution on all versions of Ruby due to
 | 
			
		||||
  # https://github.com/bundler/bundler/pull/3338.
 | 
			
		||||
  bundle config build.charlock_holmes --with-icu-include=$(pwd)/vendor/debs/include --with-icu-lib=$(pwd)/vendor/debs/lib
 | 
			
		||||
else
 | 
			
		||||
  bundle config build.charlock_holmes --with-icu-dir=$(pwd)/vendor/debs
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
git submodule init
 | 
			
		||||
git submodule sync --quiet
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user