Also clarify universal build rules
Unified · Split
| @@ -588,6 +588,10 @@ process_common_toolchain() { · 587 unmodified lines | |||
| 588 | tgt_isa=x86_64 | 588 | tgt_isa=x86_64 |
| 589 | tgt_os=darwin11 | 589 | tgt_os=darwin11 |
| 590 | ;; | 590 | ;; |
| 591 | *darwin12*) | ||
| 592 | tgt_isa=x86_64 | ||
| 593 | tgt_os=darwin12 | ||
| 594 | ;; | ||
| 591 | *mingw32*|*cygwin*) | 595 | *mingw32*|*cygwin*) |
| 592 | [ -z "$tgt_isa" ] && tgt_isa=x86 | 596 | [ -z "$tgt_isa" ] && tgt_isa=x86 |
| 593 | tgt_os=win32 | 597 | tgt_os=win32 |
| @@ -679,6 +683,10 @@ process_common_toolchain() { · 85 unmodified lines | |||
| 679 | add_cflags "-mmacosx-version-min=10.7" | 683 | add_cflags "-mmacosx-version-min=10.7" |
| 680 | add_ldflags "-mmacosx-version-min=10.7" | 684 | add_ldflags "-mmacosx-version-min=10.7" |
| 681 | ;; | 685 | ;; |
| 686 | *-darwin12-*) | ||
| 687 | add_cflags "-mmacosx-version-min=10.8" | ||
| 688 | add_ldflags "-mmacosx-version-min=10.8" | ||
| 689 | ;; | ||
| 682 | esac | 690 | esac |
| 683 | 691 | ||
| 684 | # Handle Solaris variants. Solaris 10 needs -lposix4 | 692 | # Handle Solaris variants. Solaris 10 needs -lposix4 |
| @@ -109,6 +109,8 @@ all_platforms="${all_platforms} x86-darwin8-icc" · 108 unmodified lines | |||
| 109 | all_platforms="${all_platforms} x86-darwin9-gcc" | 109 | all_platforms="${all_platforms} x86-darwin9-gcc" |
| 110 | all_platforms="${all_platforms} x86-darwin9-icc" | 110 | all_platforms="${all_platforms} x86-darwin9-icc" |
| 111 | all_platforms="${all_platforms} x86-darwin10-gcc" | 111 | all_platforms="${all_platforms} x86-darwin10-gcc" |
| 112 | all_platforms="${all_platforms} x86-darwin11-gcc" | ||
| 113 | all_platforms="${all_platforms} x86-darwin12-gcc" | ||
| 112 | all_platforms="${all_platforms} x86-linux-gcc" | 114 | all_platforms="${all_platforms} x86-linux-gcc" |
| 113 | all_platforms="${all_platforms} x86-linux-icc" | 115 | all_platforms="${all_platforms} x86-linux-icc" |
| 114 | all_platforms="${all_platforms} x86-os2-gcc" | 116 | all_platforms="${all_platforms} x86-os2-gcc" |
| @@ -120,6 +122,7 @@ all_platforms="${all_platforms} x86-win32-vs9" · 5 unmodified lines | |||
| 120 | all_platforms="${all_platforms} x86_64-darwin9-gcc" | 122 | all_platforms="${all_platforms} x86_64-darwin9-gcc" |
| 121 | all_platforms="${all_platforms} x86_64-darwin10-gcc" | 123 | all_platforms="${all_platforms} x86_64-darwin10-gcc" |
| 122 | all_platforms="${all_platforms} x86_64-darwin11-gcc" | 124 | all_platforms="${all_platforms} x86_64-darwin11-gcc" |
| 125 | all_platforms="${all_platforms} x86_64-darwin12-gcc" | ||
| 123 | all_platforms="${all_platforms} x86_64-linux-gcc" | 126 | all_platforms="${all_platforms} x86_64-linux-gcc" |
| 124 | all_platforms="${all_platforms} x86_64-linux-icc" | 127 | all_platforms="${all_platforms} x86_64-linux-icc" |
| 125 | all_platforms="${all_platforms} x86_64-solaris-gcc" | 128 | all_platforms="${all_platforms} x86_64-solaris-gcc" |
| @@ -128,6 +131,9 @@ all_platforms="${all_platforms} x86_64-win64-vs8" · 2 unmodified lines | |||
| 128 | all_platforms="${all_platforms} x86_64-win64-vs9" | 131 | all_platforms="${all_platforms} x86_64-win64-vs9" |
| 129 | all_platforms="${all_platforms} universal-darwin8-gcc" | 132 | all_platforms="${all_platforms} universal-darwin8-gcc" |
| 130 | all_platforms="${all_platforms} universal-darwin9-gcc" | 133 | all_platforms="${all_platforms} universal-darwin9-gcc" |
| 134 | all_platforms="${all_platforms} universal-darwin10-gcc" | ||
| 135 | all_platforms="${all_platforms} universal-darwin11-gcc" | ||
| 136 | all_platforms="${all_platforms} universal-darwin12-gcc" | ||
| 131 | all_platforms="${all_platforms} generic-gnu" | 137 | all_platforms="${all_platforms} generic-gnu" |
| 132 | 138 | ||
| 133 | # all_targets is a list of all targets that can be configured | 139 | # all_targets is a list of all targets that can be configured |
| @@ -493,11 +499,20 @@ process_toolchain() { · 359 unmodified lines | |||
| 493 | case $toolchain in | 499 | case $toolchain in |
| 494 | universal-darwin*) | 500 | universal-darwin*) |
| 495 | local darwin_ver=${tgt_os##darwin} | 501 | local darwin_ver=${tgt_os##darwin} |
| 496 | fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-gcc" | ||
| 497 | 502 | ||
| 498 | # Intel | 503 | # Snow Leopard (10.6/darwin10) dropped support for PPC |
| 499 | fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" | 504 | # Include PPC support for all prior versions |
| 500 | if [ $darwin_ver -gt 8 ]; then | 505 | if [ $darwin_ver -lt 10 ]; then |
| 506 | fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-gcc" | ||
| 507 | fi | ||
| 508 | |||
| 509 | # Tiger (10.4/darwin8) brought support for x86 | ||
| 510 | if [ $darwin_ver -ge 8 ]; then | ||
| 511 | fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" | ||
| 512 | fi | ||
| 513 | |||
| 514 | # Leopard (10.5/darwin9) brought 64 bit support | ||
| 515 | if [ $darwin_ver -ge 9 ]; then | ||
| 501 | fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}" | 516 | fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}" |
| 502 | fi | 517 | fi |
| 503 | ;; | 518 | ;; |