mirror of
https://github.com/docker/docker-credential-helpers.git
synced 2026-06-13 16:01:28 +05:30
osxkeychain: match min macos version for xx
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
@@ -120,6 +120,7 @@ RUN --mount=type=bind,target=. \
|
|||||||
--mount=type=bind,source=/tmp/.version,target=/tmp/.version,from=version \
|
--mount=type=bind,source=/tmp/.version,target=/tmp/.version,from=version \
|
||||||
--mount=type=bind,source=/tmp/.revision,target=/tmp/.revision,from=version <<EOT
|
--mount=type=bind,source=/tmp/.revision,target=/tmp/.revision,from=version <<EOT
|
||||||
set -ex
|
set -ex
|
||||||
|
export MACOSX_VERSION_MIN=$(make print-MACOSX_DEPLOYMENT_TARGET)
|
||||||
xx-go --wrap
|
xx-go --wrap
|
||||||
go install std
|
go install std
|
||||||
make build-osxkeychain build-pass PACKAGE=$PACKAGE VERSION=$(cat /tmp/.version) REVISION=$(cat /tmp/.revision) DESTDIR=/out
|
make build-osxkeychain build-pass PACKAGE=$PACKAGE VERSION=$(cat /tmp/.version) REVISION=$(cat /tmp/.revision) DESTDIR=/out
|
||||||
|
|||||||
@@ -9,6 +9,12 @@ BUILDX_CMD ?= docker buildx
|
|||||||
DESTDIR ?= ./bin/build
|
DESTDIR ?= ./bin/build
|
||||||
COVERAGEDIR ?= ./bin/coverage
|
COVERAGEDIR ?= ./bin/coverage
|
||||||
|
|
||||||
|
# 10.11 is the minimum supported version for osxkeychain
|
||||||
|
export MACOSX_DEPLOYMENT_TARGET = 10.11
|
||||||
|
ifeq "$(shell go env GOOS)" "darwin"
|
||||||
|
export CGO_CFLAGS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
|
||||||
|
endif
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: cross
|
all: cross
|
||||||
|
|
||||||
@@ -75,3 +81,6 @@ vendor:
|
|||||||
rm -rf ./vendor
|
rm -rf ./vendor
|
||||||
cp -R "$($@_TMP_OUT)"/* .
|
cp -R "$($@_TMP_OUT)"/* .
|
||||||
rm -rf "$($@_TMP_OUT)"
|
rm -rf "$($@_TMP_OUT)"
|
||||||
|
|
||||||
|
.PHONY: print-%
|
||||||
|
print-%: ; @echo $($*)
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package osxkeychain
|
package osxkeychain
|
||||||
|
|
||||||
/*
|
/*
|
||||||
#cgo CFLAGS: -x objective-c -mmacosx-version-min=10.11
|
#cgo CFLAGS: -x objective-c
|
||||||
#cgo LDFLAGS: -framework Security -framework Foundation -mmacosx-version-min=10.11
|
#cgo LDFLAGS: -framework Security -framework Foundation
|
||||||
|
|
||||||
#include "osxkeychain_darwin.h"
|
#include "osxkeychain_darwin.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user