From 9609a835ca2eb3089e35269a05369833e9ec0ba2 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Mon, 21 Dec 2020 16:19:22 +0100 Subject: Squashed 'gitstatus/' changes from 630915cc..6d00edd0 6d00edd0 use a native binary on darwin-arm64 4994f160 add a build server for darwin-arm64 0e922813 invoke port with sudo 576571c7 support macports in addition to homebrew when building on macos b476570a remove trailing whitespace git-subtree-dir: gitstatus git-subtree-split: 6d00edd0bfd1d65a3cbcebfc6e679e8c43726acc --- mbuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mbuild') diff --git a/mbuild b/mbuild index 02408802..608e3aba 100755 --- a/mbuild +++ b/mbuild @@ -5,7 +5,7 @@ # Usage: mbuild [-b git-ref] [kernel-arch]... # # Builds a bunch of gitstatusd-* binaries. Without arguments builds binaries -# for all platforms. git-ref defaults to src. +# for all platforms. git-ref defaults to master. # # Before using this script you need to set up build servers and list them # in ~/.ssh/config. There should be a Host entry for every value of `assets` @@ -111,6 +111,7 @@ local -rA assets=( cygwin_nt-10.0-x86_64 build-windows-x86_64 msys_nt-10.0-i686 build-windows-x86_64 msys_nt-10.0-x86_64 build-windows-x86_64 + darwin-arm64 build-macos-arm64 darwin-x86_64 build-macos-x86_64 freebsd-amd64 build-freebsd-amd64 linux-aarch64 build-linux-aarch64 @@ -138,7 +139,7 @@ function usage() { print -r -- 'usage: mbuild [-b REF] [KERNEL-ARCH]...' } -local OPTARG opt git_ref=src +local OPTARG opt git_ref=master local -i OPTIND while getopts ":b:h" opt; do case $opt in @@ -183,7 +184,7 @@ function build-unix() { case $2 in linux-ppc64le) ;; linux-*) flags+=(-d docker);; - darwin-arm64) intro='PATH="/opt/homebrew/bin:$PATH"';; + darwin-arm64) intro='PATH="/opt/local/bin:$PATH"';; darwin-*) intro='PATH="/usr/local/bin:$PATH"';; esac ssh $1 -- /bin/sh -uex <<<" -- cgit v1.2.3