| 1 | *** build.sh.orig 2014-10-23 13:31:58.000000000 -0700 |
|---|
| 2 | --- build.sh 2014-11-05 13:27:15.000000000 -0800 |
|---|
| 3 | *************** |
|---|
| 4 | *** 63,68 **** |
|---|
| 5 | --- 63,71 ---- |
|---|
| 6 | |
|---|
| 7 | # Other implementation details |
|---|
| 8 | # |
|---|
| 9 | + declare M_XCODE31="" |
|---|
| 10 | + declare M_XCODE31_VERSION=3.1 |
|---|
| 11 | + readonly M_XCODE31_COMPILER="4.0" |
|---|
| 12 | declare M_XCODE32="" |
|---|
| 13 | declare M_XCODE32_VERSION=3.2 |
|---|
| 14 | readonly M_XCODE32_COMPILER="4.2" |
|---|
| 15 | *************** |
|---|
| 16 | *** 1906,1912 **** |
|---|
| 17 | |
|---|
| 18 | m_log "building OSXFUSE kernel extension and tools" |
|---|
| 19 | |
|---|
| 20 | ! xcodebuild -configuration "$m_configuration" -target All GCC_VERSION="$m_compiler" ARCHS="Power Macintosh" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" >$m_stdout 2>$m_stderr |
|---|
| 21 | |
|---|
| 22 | m_exit_on_error "xcodebuild cannot build configuration $m_configuration." |
|---|
| 23 | |
|---|
| 24 | --- 1909,1915 ---- |
|---|
| 25 | |
|---|
| 26 | m_log "building OSXFUSE kernel extension and tools" |
|---|
| 27 | |
|---|
| 28 | ! xcodebuild -configuration "$m_configuration" -target All GCC_VERSION="$m_compiler" ARCHS="ppc" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" >$m_stdout 2>$m_stderr |
|---|
| 29 | |
|---|
| 30 | m_exit_on_error "xcodebuild cannot build configuration $m_configuration." |
|---|
| 31 | |
|---|
| 32 | *************** |
|---|
| 33 | *** 2307,2312 **** |
|---|
| 34 | --- 2310,2323 ---- |
|---|
| 35 | m_xcode_version=`DEVELOPER_DIR="$m_xcode_root" xcodebuild -version | grep "Xcode" | cut -f 2 -d " "` |
|---|
| 36 | |
|---|
| 37 | case $m_xcode_version in |
|---|
| 38 | + 3.1*) |
|---|
| 39 | + m_version_compare $M_XCODE31_VERSION $m_xcode_version |
|---|
| 40 | + if [[ $? != 2 ]] |
|---|
| 41 | + then |
|---|
| 42 | + M_XCODE31="$m_xcode_root" |
|---|
| 43 | + M_XCODE31_VERSION=$m_xcode_version |
|---|
| 44 | + fi |
|---|
| 45 | + ;; |
|---|
| 46 | 3.2*) |
|---|
| 47 | m_version_compare $M_XCODE32_VERSION $m_xcode_version |
|---|
| 48 | if [[ $? != 2 ]] |
|---|
| 49 | *************** |
|---|
| 50 | *** 2402,2407 **** |
|---|
| 51 | --- 2413,2427 ---- |
|---|
| 52 | done |
|---|
| 53 | |
|---|
| 54 | # Use most recent version of Xcode for each SDK |
|---|
| 55 | + if [[ -n "$M_XCODE31" ]] |
|---|
| 56 | + then |
|---|
| 57 | + m_xcode_latest="$M_XCODE31" |
|---|
| 58 | + |
|---|
| 59 | + M_SDK_105="$M_XCODE31/SDKs/MacOSX10.5.sdk" |
|---|
| 60 | + M_SDK_105_XCODE="$M_XCODE31" |
|---|
| 61 | + M_SDK_105_COMPILER="$M_XCODE31_COMPILER" |
|---|
| 62 | + m_platform_realistic_add "10.5" |
|---|
| 63 | + fi |
|---|
| 64 | if [[ -n "$M_XCODE32" ]] |
|---|
| 65 | then |
|---|
| 66 | m_xcode_latest="$M_XCODE32" |
|---|
