Ticket #23944: patch-macos.inc.diff

File patch-macos.inc.diff, 984 bytes (added by raphael-st (Raphael Straub), 15 years ago)
  • build/macos.inc

    old new  
    4343
    4444ifndef runtime
    4545 #gcc_version:=$(shell gcc -v 2>&1 | grep 'gcc version' | sed -e 's/^gcc version //' | sed -e 's/ .*$$//' )
    46  gcc_version_full=$(shell gcc --version | grep 'gcc'| egrep -o ' [0-9]+\.[0-9]+\.[0-9]+.*' | sed -e 's/^\ //')
     46 gcc_version_full=$(shell /usr/bin/gcc --version | grep 'gcc'| egrep -o ' [0-9]+\.[0-9]+\.[0-9]+.*' | sed -e 's/^\ //')
    4747 gcc_version=$(shell echo "$(gcc_version_full)" | egrep -o '^[0-9]+\.[0-9]+\.[0-9]+\s*' | head -n 1 | sed -e 's/ *//g')
    4848 os_version:=$(shell /usr/bin/sw_vers -productVersion)
    4949 export runtime:=cc$(gcc_version)_os$(os_version)
     
    6969DLL=dylib
    7070LIBEXT=dylib
    7171
    72 def_prefix = $(if $(findstring 32,$(arch)),mac32,mac64)
     72def_prefix = $(if $(findstring 64,$(arch)),mac64,mac32)
    7373
    7474TBB.DEF = $(tbb_root)/src/tbb/$(def_prefix)-tbb-export.def
    7575TBB.DLL = libtbb$(DEBUG_SUFFIX).$(DLL)