aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml2
-rw-r--r--.promu.yml (renamed from .promu-no-cgo.yml)0
-rw-r--r--Makefile4
3 files changed, 3 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index e5688ea..abda9db 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
33 steps: 33 steps:
34 - checkout 34 - checkout
35 - run: make promu 35 - run: make promu
36 - run: promu --config .promu-no-cgo.yml crossbuild -v --go 1.11 36 - run: promu crossbuild -v --go 1.11
37 - run: promu --config .promu-cgo.yml crossbuild -v --go 1.11 37 - run: promu --config .promu-cgo.yml crossbuild -v --go 1.11
38 - persist_to_workspace: 38 - persist_to_workspace:
39 root: . 39 root: .
diff --git a/.promu-no-cgo.yml b/.promu.yml
index b329ed3..b329ed3 100644
--- a/.promu-no-cgo.yml
+++ b/.promu.yml
diff --git a/Makefile b/Makefile
index 835a407..dae2c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,11 @@ endif
46 46
47# Use CGO for non-Linux builds. 47# Use CGO for non-Linux builds.
48ifeq ($(GOOS), linux) 48ifeq ($(GOOS), linux)
49 PROMU_CONF ?= .promu-no-cgo.yml 49 PROMU_CONF ?= .promu.yml
50else 50else
51 ifndef GOOS 51 ifndef GOOS
52 ifeq ($(OS_detected), Linux) 52 ifeq ($(OS_detected), Linux)
53 PROMU_CONF ?= .promu-no-cgo.yml 53 PROMU_CONF ?= .promu.yml
54 else 54 else
55 PROMU_CONF ?= .promu-cgo.yml 55 PROMU_CONF ?= .promu-cgo.yml
56 endif 56 endif