wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tbb: patch for compiler verison parsing

Browse source 
Fixes Homebrew/homebrew#22837.
This commit is contained in:
Misty De Meo 2013-09-27 19:25:30 -07:00
parent 6fe82a4e8a
commit 961e36100a
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Formula/tbb.rb
View file

@ -10,6 +10,11 @@ class Tbb < Formula
cause 'llvm is not supported on macos. Add build/macos.llvm.inc file with compiler-specific settings.'
end
# tbb uses the wrong command (-v, verbose) to fetch the version from the
# compiler, causing problems if the compiler returns additional debug info
# Reported upstream at http://software.intel.com/en-us/forums/topic/475120
def patches; DATA; end
def install
# Intel sets varying O levels on each compile command.
ENV.no_optimization
@ -23,3 +28,18 @@ class Tbb < Formula
include.install 'include/tbb'
end
end
__END__
diff --git a/build/version_info_macos.sh b/build/version_info_macos.sh
index 5970aad..20c863a 100644
--- a/build/version_info_macos.sh
+++ b/build/version_info_macos.sh
@@ -31,7 +31,7 @@ echo "#define __TBB_VERSION_STRINGS(N) \\"
echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`arch`")"'" ENDL \'
echo '#N": BUILD_OS'"\t\t"`sw_vers -productName`" version "`sw_vers -productVersion`'" ENDL \'
echo '#N": BUILD_KERNEL'"\t"`uname -v`'" ENDL \'
-echo '#N": BUILD_GCC'"\t\t"`gcc -v </dev/null 2>&1 | grep 'version'`'" ENDL \'
+echo '#N": BUILD_GCC'"\t\t"`gcc --version </dev/null 2>&1 | head -1`'" ENDL \'
[ -z "$COMPILER_VERSION" ] || echo '#N": BUILD_COMPILER'"\t"$COMPILER_VERSION'" ENDL \'
echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \'
echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \'