Unverified Commit 3c36d79a authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET

parent 1877dbbd

projects/rust/build

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ export PATH="$distdir-rust-old/bin:$PATH" 
  # (i.e. Linux).

  unset CC

  unset LDFLAGS

  # Target 10.7 as our toolchain does. Without this explicit declaration Bad

  # Target 10.9 as our toolchain does. Without this explicit declaration Bad

  # Things will happen, as a lot of dependent code then assumes that the

  # official macOS target, x86_64-apple-darwin, essentially means 10.4.

  export MACOSX_DEPLOYMENT_TARGET=10.7

  export MACOSX_DEPLOYMENT_TARGET=10.9

  # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built

  # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused

  # that way. Changing the Rust target to x86_64-apple-darwin11 would require a

projects/snowflake/build

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ distdir=/var/tmp/dist/[% project %] 
mkdir -p $PTDIR $DOCSDIR

[% IF c("var/osx") %]

  export CGO_ENABLED=1

  export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7"

  export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"

  export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7"

  export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.9"

  export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9"

  export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9"

  export CC="$clangdir/bin/clang"

  export CXX="$clangdir/bin/clang++"

[% END %]

projects/snowflake/config

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ targets: 
  osx-x86_64:

    var:

      arch_deps:

        - pkg-config

        - faketime



input_files:

projects/webrtc/build

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ print("$sysrootdir") 
print("10.11")

EOF

  cat <<EOF > build/config/mac/sdk_info.py

print("machine_os_build=\"10.7\"")

print("machine_os_build=\"10.9\"")

print("sdk_build=\"10.11\"")

print("sdk_path=\"$sysrootdir\"")

print("sdk_platform_path=\"$sysrootdir\"")
@@ -115,7 +115,7 @@ GN_ARGS+=" use_custom_libcxx=false" 
  #GN_ARGS+=" rtc_include_tests=false"

[% END -%]

[% IF c("var/osx") -%]

  GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\""

  GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.9\""

  GN_ARGS+=" clang_use_chrome_plugins=false"

  GN_ARGS+=" clang_base_path=\"$clangdir\""

  # No lld in our toolchain currently.