osx build job in circle - cross-compiling is a PITA, let's not bother

maintaining it

(But leave the osxcross code in place, it works locally for me.)

Author: ismith

.circleci/config.yml

@@ -50,10 +50,7 @@ jobs:
         command: sudo apt install -y clang gcc-mingw-w64-x86-64 llvm-4.0-dev musl-tools
     - run:
         name: install-rust-deps
-        command: rustup target add x86_64-apple-darwin && rustup target add x86_64-unknown-linux-musl && rustup target add x86_64-pc-windows-gnu
-    - run:
-        name: install osxcross-with-clang
-        command: curl -O https://dark-osxcross-files.storage.googleapis.com/osxcross-with-clang.tar.gz && tar --strip-components=1 -xf osxcross-with-clang.tar.gz && rm osxcross-with-clang.tar.gz
+        command: rustup target add x86_64-unknown-linux-musl && rustup target add x86_64-pc-windows-gnu
     - run:
         name: Build all targets
         command: PATH=bin:$PATH ./build --release
@@ -63,7 +60,46 @@ jobs:
         - target/
     - run:
         name: prep-artifacts
-        command: mkdir artifacts && cp target/x86_64-apple-darwin/release/dark-cli artifacts/dark-cli-apple && cp target/x86_64-unknown-linux-musl/release/dark-cli artifacts/dark-cli-linux && cp target/x86_64-pc-windows-gnu/release/dark-cli.exe artifacts/dark-cli.exe
+        command: mkdir artifacts && cp target/x86_64-unknown-linux-musl/release/dark-cli artifacts/dark-cli-linux && cp target/x86_64-pc-windows-gnu/release/dark-cli.exe artifacts/dark-cli.exe
+    - store_artifacts:
+        path:
+          artifacts
+    - save_cache:
+        name: Cargo.lock cache
+        paths:
+        - target
+        key: v1-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
+  build-osx:
+    macos:
+      xcode: "11.0.0"
+    steps:
+    - checkout
+    - run:
+        name: Install rustup
+        command: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    - run:
+        name: Version information
+        command: source ~/.cargo/env; rustc --version; cargo --version; rustup --version
+    - run:
+        name: Calculate dependencies
+        command: source ~/.cargo/env; cargo generate-lockfile
+    - restore_cache:
+        name: Cargo.lock cache
+        keys:
+        - v1-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
+    - run:
+        name: install-rust-deps
+        command: source ~/.cargo/env; rustup target add x86_64-apple-darwin
+    - run:
+        name: Build all targets
+        command: source ~/.cargo/env; ln -s $(which clang) ~/.cargo/bin/x86_64-apple-darwin15-clang ; ./build-osx --release
+    - persist_to_workspace:
+        root: .
+        paths:
+        - target/
+    - run:
+        name: prep-artifacts
+        command: mkdir artifacts && cp target/x86_64-apple-darwin/release/dark-cli artifacts/dark-cli-apple
     - store_artifacts:
         path:
           artifacts
@@ -78,3 +114,4 @@ workflows:
     jobs:
     - test
     - build
+    - build-osx

build

@@ -28,12 +28,6 @@ if [[ ! -z "${DEV}" ]]; then
     esac
 else
   cargo build --target x86_64-unknown-linux-gnu ${RELEASE}
-  if [[ -f ./bin/x86_64-apple-darwin15-clang ]]; then
-      export PATH=./bin:$PATH
-  else
-      export PATH=../../target/bin:$PATH
-  fi
-  cargo build --target x86_64-apple-darwin ${RELEASE}
   cargo build --target x86_64-pc-windows-gnu ${RELEASE}
   cargo build --target x86_64-unknown-linux-musl --features vendored ${RELEASE}
 fi

build-osx

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+RELEASE=""
+DEV=""
+for i in "$@"; do
+    case "${i}" in
+        --release)
+        RELEASE="${i}"
+        shift
+        ;;
+    esac
+done
+
+
+set -x
+
+if [[ ! -f $(which x86_64-apple-darwin15-clang) ]]; then
+    echo "No x86_64-apple-darwin15-clang found; you probably want to symlink to /usr/bin/clang"
+    exit 1
+fi
+
+cargo build --target x86_64-apple-darwin ${RELEASE}