Unverified Commit 7a01c996 authored by boklm's avatar boklm
Browse files

fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET

parent 15d4645a

projects/go-webrtc/config

+3 −3
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ var: 
    [% END -%]

    [% 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=[% c("var/macosx_deployment_target") %]"

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

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

      export CC="$clangdir/bin/clang"

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

    [% END -%]

projects/rust/build

+2 −2
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ export PATH="$distdir-rust-old/bin:$PATH" 
  # 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.9

  export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %]

  # 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

  # fair amount of patching, thus we create symlinks to provide Rust with the

  # necessary tools while using our toolchain underneath, targeting 10.7.

  # necessary tools while using our toolchain underneath, targeting 10.9.

  cd $cctoolsdir

  for f in `ls x86_64-apple-darwin11-*`; do

    ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin}

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.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 CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"

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

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

  export CC="$clangdir/bin/clang"

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

[% END %]

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.9\"")

print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"")

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.9\""

  GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\""

  GN_ARGS+=" clang_use_chrome_plugins=false"

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

  # No lld in our toolchain currently.

rbm.conf

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ targets: 
      configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"'

      FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"

      LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"

      macosx_deployment_target: '10.9'

      locale_ja: ja-JP-mac

      # We only build snowflake for linux and macOS on the alpha and nightly

      # channels for now.