Merge pull request #3943 from bukzor/clang-build-version
fix clang build version on Ubuntu Artful
This commit is contained in:
		
						commit
						8307347987
					
				@ -74,7 +74,7 @@ class DevelopmentTools
 | 
			
		||||
    def clang_build_version
 | 
			
		||||
      @clang_build_version ||= begin
 | 
			
		||||
        if (path = locate("clang")) &&
 | 
			
		||||
           build_version = `#{path} --version`[/clang-(\d{2,})/, 1]
 | 
			
		||||
           build_version = `#{path} --version`[%r{clang(-| version [^ ]+ \(tags/RELEASE_)(\d{2,})}, 2]
 | 
			
		||||
          Version.new build_version
 | 
			
		||||
        else
 | 
			
		||||
          Version::NULL
 | 
			
		||||
 | 
			
		||||
@ -210,7 +210,17 @@ class SystemConfig
 | 
			
		||||
      f.puts "Homebrew Ruby: #{describe_homebrew_ruby}"
 | 
			
		||||
      f.puts "GCC-4.0: build #{gcc_4_0}" unless gcc_4_0.null?
 | 
			
		||||
      f.puts "GCC-4.2: build #{gcc_4_2}" unless gcc_4_2.null?
 | 
			
		||||
      f.puts "Clang: #{clang.null? ? "N/A" : "#{clang} build #{clang_build}"}"
 | 
			
		||||
      f.print "Clang: "
 | 
			
		||||
      if clang.null?
 | 
			
		||||
        f.puts "N/A"
 | 
			
		||||
      else
 | 
			
		||||
        f.print "#{clang} build "
 | 
			
		||||
        if clang_build.null?
 | 
			
		||||
          f.puts "(parse error)"
 | 
			
		||||
        else
 | 
			
		||||
          f.puts clang_build
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
      f.puts "Git: #{describe_git}"
 | 
			
		||||
      f.puts "Curl: #{describe_curl}"
 | 
			
		||||
      f.puts "Perl: #{describe_perl}"
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user