From 6a18079de8a39cf8438d60e51b3de2cd3a7edf00 Mon Sep 17 00:00:00 2001
From: "commit-bot@chromium.org"
 <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Wed, 15 Jan 2014 21:39:18 +0000
Subject: [PATCH] Use MACOSX_DEPLOYMENT_TARGET instead of SDKROOT.

MACOSX_DEPLOYMENT_TARGET is the minimum unconditionally supported OS,
which should just be 10.6 for us until Chrome changes.  SDKROOT is the
maximum conditionally supported OS, which defaults sanely to whatever's
the latest SDK the machine has, so we don't need to mention it.

BUG=skia:
R=bungeman@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/137793010

git-svn-id: http://skia.googlecode.com/svn/trunk@13102 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 gyp/common_conditions.gypi | 20 ++-------------
 src/views/mac/SkNSView.mm  |  1 +
 tools/find_mac_sdk.py      | 63 ----------------------------------------------
 3 files changed, 3 insertions(+), 81 deletions(-)
 delete mode 100755 tools/find_mac_sdk.py

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 83bc561..f3caddc 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -300,9 +300,6 @@
 
     [ 'skia_os == "mac"',
       {
-        'variables': {
-          'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)',
-        },
         'defines': [
           'SK_BUILD_FOR_MAC',
         ],
@@ -324,14 +321,7 @@
                 '-Wall',
                 '-Wextra',
                 '-Wno-unused-parameter',
-              ],
-            },
-          }],
-# This old compiler is really bad at figuring out when things are uninitialized, so ignore it.
-          [ '<(mac_sdk)==10.6', {
-            'xcode_settings': {
-              'OTHER_CPLUSPLUSFLAGS': [
-                '-Wno-uninitialized',
+                '-Wno-uninitialized',  # Disabled because we think GCC 4.2 is bad at this.
               ],
             },
           }],
@@ -358,13 +348,7 @@
         },
         'xcode_settings': {
           'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
-          'conditions': [
-            [ 'skia_osx_sdkroot==""', {
-              'SDKROOT': 'macosx<(mac_sdk)',  # -isysroot
-            }, {
-              'SDKROOT': '<(skia_osx_sdkroot)',  # -isysroot
-            }],
-           ],
+          'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in environment to ld.
 # trying to get this to work, but it needs clang I think...
 #          'WARNING_CFLAGS': '-Wexit-time-destructors',
           'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
diff --git a/src/views/mac/SkNSView.mm b/src/views/mac/SkNSView.mm
index 475b08f..209aeca 100644
--- a/src/views/mac/SkNSView.mm
+++ b/src/views/mac/SkNSView.mm
@@ -11,6 +11,7 @@
 #include "SkCGUtils.h"
 #include "SkEvent.h"
 SK_COMPILE_ASSERT(SK_SUPPORT_GPU, not_implemented_for_non_gpu_build);
+#include <OpenGL/gl.h>
 
 //#define FORCE_REDRAW
 // Can be dropped when we no longer support 10.6.
diff --git a/tools/find_mac_sdk.py b/tools/find_mac_sdk.py
deleted file mode 100755
index 3fe9c3c..0000000
--- a/tools/find_mac_sdk.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import os
-import re
-import subprocess
-import sys
-
-"""Prints the lowest locally available SDK version greater than or equal to a
-given minimum sdk version to standard output.
-
-Usage:
-  python find_sdk.py 10.6  # Ignores SDKs < 10.6
-"""
-
-def parse_version(version_str):
-  """'10.6' => [10, 6]"""
-  return map(int, re.findall(r'(\d+)', version_str))
-
-def find_sdk_dir():
-  job = subprocess.Popen(['xcode-select', '-print-path'],
-                         stdout=subprocess.PIPE,
-                         stderr=subprocess.STDOUT)
-  out, err = job.communicate()
-  if job.returncode != 0:
-    print >>sys.stderr, out
-    print >>sys.stderr, err
-    raise Exception(('Error %d running xcode-select, you might have to run '
-      '|sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer| '
-      'if you are using Xcode 4.') % job.returncode)
-  # The Developer folder moved in Xcode 4.3.
-  xcode43_sdk_path = os.path.join(
-      out.rstrip(), 'Platforms/MacOSX.platform/Developer/SDKs')
-  if os.path.isdir(xcode43_sdk_path):
-    sdk_dir = xcode43_sdk_path
-  else:
-    sdk_dir = os.path.join(out.rstrip(), 'SDKs')
-    
-  return sdk_dir
-
-def main():
-  min_sdk_version = '10.6'
-  if len(sys.argv) > 1:
-    min_sdk_version = sys.argv[1]
-
-  sdk_dir = find_sdk_dir()
-
-  sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)]
-  sdks = [s[0] for s in sdks if s]  # [['10.5'], ['10.6']] => ['10.5', '10.6']
-  sdks = [s for s in sdks  # ['10.5', '10.6'] => ['10.6']
-          if parse_version(s) >= parse_version(min_sdk_version)]
-  if not sdks:
-    raise Exception('No %s+ SDK found' % min_sdk_version)
-  best_sdk = min(sdks, key=parse_version)
-
-  return best_sdk
-
-if __name__ == '__main__':
-  if sys.platform != 'darwin':
-    raise Exception("This script only runs on Mac")
-  print main()
-- 
2.7.4