As we reevaluate how to best support and maintain Staging Ref in the future, we encourage development teams using this environment to highlight their use cases in the following issue: https://gitlab.com/gitlab-com/gl-infra/software-delivery/framework/software-delivery-framework-issue-tracker/-/issues/36.

Skip to content
Snippets Groups Projects
Commit 124ebdd2 authored by Ash McKenzie's avatar Ash McKenzie
Browse files

Merge branch 'brodock/fix-heimdal-homebrew' into 'main'

Fix CGO_CFLAGS to use output from `brew --prefix`

Closes gitlab-development-kit#1790

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/724



Merged-by: default avatarAsh McKenzie <amckenzie@gitlab.com>
Approved-by: default avatarAsh McKenzie <amckenzie@gitlab.com>
Approved-by: default avatarAlejandro Rodríguez <alejandro@gitlab.com>
Co-authored-by: default avatarGabriel Mazetto <gabriel@gitlab.com>
parents adc7d993 80dce685
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -22,8 +22,10 @@ ifeq (${FIPS_MODE}, 1)
endif
ifeq (${OS}, Darwin) # Mac OS
BREW_PREFIX := $(shell brew --prefix 2>/dev/null || echo "/opt/homebrew")
# To be able to compile gssapi library
export CGO_CFLAGS="-I/opt/homebrew/opt/heimdal/include"
export CGO_CFLAGS="-I$(BREW_PREFIX)/opt/heimdal/include"
endif
GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)" -mod=mod
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment