From 60687e6affff67fcb78ccdd0feb726f0a3f66059 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 7 Apr 2019 02:02:32 -0400
Subject: [PATCH] So apparently only macosx10.13 is valid?! Just use the
 default SDK.

---
 azure-pipelines_linux | 17 ++--------
 azure-pipelines_main  | 76 -------------------------------------------
 2 files changed, 3 insertions(+), 90 deletions(-)

diff --git a/azure-pipelines_linux b/azure-pipelines_linux
index 6baf6f2c..adf3ed34 100644
--- a/azure-pipelines_linux
+++ b/azure-pipelines_linux
@@ -54,13 +54,8 @@ jobs:
 
 # mac {
 
-# notes:
-# [18:36:55]  <@jpakkane>	Don't use the xcode backend for anything serious, it's a bit crap.
-
-# TODO macosx10.14 doesn't work; it just uses the default SDK
-
-- job: darwin_amd64_1014sdk_shared
-  displayName: 'Darwin amd64 10.14 SDK Shared'
+- job: darwin_amd64_shared
+  displayName: 'Darwin amd64 Shared'
   pool:
     vmImage: 'macos-10.13'
   workspace:
@@ -71,11 +66,8 @@ jobs:
   - template: azure-pipelines/darwin-install-ninja.yml
   - template: azure-pipelines/configure.yml
     parameters:
-      beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
       defaultLibrary: shared
   - template: azure-pipelines/build.yml
-    parameters:
-      beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
   - template: azure-pipelines/darwinunix-artifacts.yml
     parameters:
       os: darwin
@@ -84,7 +76,7 @@ jobs:
       libfiles: libui.A.dylib
       osHeader: ui_darwin.h
 
-- job: darwin_amd64_1014sdk_static
+- job: darwin_amd64_static
   displayName: 'Darwin amd64 10.14 SDK Static'
   pool:
     vmImage: 'macos-10.13'
@@ -96,11 +88,8 @@ jobs:
   - template: azure-pipelines/darwin-install-ninja.yml
   - template: azure-pipelines/configure.yml
     parameters:
-      beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
       defaultLibrary: static
   - template: azure-pipelines/build.yml
-    parameters:
-      beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.14 Path)
   - template: azure-pipelines/darwinunix-artifacts.yml
     parameters:
       os: darwin
diff --git a/azure-pipelines_main b/azure-pipelines_main
index 79327218..17cbdc5f 100644
--- a/azure-pipelines_main
+++ b/azure-pipelines_main
@@ -221,79 +221,3 @@ jobs:
       osHeader: ui_windows.h
 
 # }
-
-# more mac {
-
-- job: darwin_amd64_1012sdk_shared
-  displayName: 'Darwin amd64 10.12 SDK Shared'
-  pool:
-    vmImage: 'macos-10.13'
-  workspace:
-    clean: all
-  steps:
-  - template: azure-pipelines/setup-python3.yml
-  - template: azure-pipelines/install-latest-meson.yml
-  - template: azure-pipelines/darwin-install-ninja.yml
-  - template: azure-pipelines/configure.yml
-    parameters:
-      beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
-      defaultLibrary: shared
-  - template: azure-pipelines/build.yml
-    parameters:
-      beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
-
-- job: darwin_amd64_1012sdk_static
-  displayName: 'Darwin amd64 10.12 SDK Static'
-  pool:
-    vmImage: 'macos-10.13'
-  workspace:
-    clean: all
-  steps:
-  - template: azure-pipelines/setup-python3.yml
-  - template: azure-pipelines/install-latest-meson.yml
-  - template: azure-pipelines/darwin-install-ninja.yml
-  - template: azure-pipelines/configure.yml
-    parameters:
-      beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
-      defaultLibrary: static
-  - template: azure-pipelines/build.yml
-    parameters:
-      beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.12 Path)
-
-- job: darwin_amd64_1013sdk_shared
-  displayName: 'Darwin amd64 10.13 SDK Shared'
-  pool:
-    vmImage: 'macos-10.13'
-  workspace:
-    clean: all
-  steps:
-  - template: azure-pipelines/setup-python3.yml
-  - template: azure-pipelines/install-latest-meson.yml
-  - template: azure-pipelines/darwin-install-ninja.yml
-  - template: azure-pipelines/configure.yml
-    parameters:
-      beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
-      defaultLibrary: shared
-  - template: azure-pipelines/build.yml
-    parameters:
-      beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
-
-- job: darwin_amd64_1013sdk_static
-  displayName: 'Darwin amd64 10.13 SDK Static'
-  pool:
-    vmImage: 'macos-10.13'
-  workspace:
-    clean: all
-  steps:
-  - template: azure-pipelines/setup-python3.yml
-  - template: azure-pipelines/install-latest-meson.yml
-  - template: azure-pipelines/darwin-install-ninja.yml
-  - template: azure-pipelines/configure.yml
-    parameters:
-      beforeConfigure: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
-      defaultLibrary: static
-  - template: azure-pipelines/build.yml
-    parameters:
-      beforeBuild: export SDKROOT=$(xcodebuild -version -sdk macosx10.13 Path)
-
-# }