diff options
| author | Misty De Meo | 2013-09-27 19:25:30 -0700 |
|---|---|---|
| committer | Misty De Meo | 2013-09-27 19:25:42 -0700 |
| commit | 9618a34c0fecd9a44519c409a34df9f1be8131d8 (patch) | |
| tree | 012d6ac9542fca14423fcdde2254204ff8fa2486 /Library | |
| parent | a8e49e1595276f25ef3c46044285dbc298484bcc (diff) | |
| download | homebrew-9618a34c0fecd9a44519c409a34df9f1be8131d8.tar.bz2 | |
tbb: patch for compiler verison parsing
Fixes #22837.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/tbb.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Library/Formula/tbb.rb b/Library/Formula/tbb.rb index 952ed7097..040407f46 100644 --- a/Library/Formula/tbb.rb +++ b/Library/Formula/tbb.rb @@ -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 \' |