fix(*): envoy build scripts (#4225)

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
kumahq · Nov 29, 2022 · 642ead0 · 642ead0
1 parent 4a90437
commit 642ead0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mk/envoy.mk b/mk/envoy.mk
@@ -9,7 +9,12 @@ ENVOY_VERSION = $(shell ${KUMA_DIR}/tools/envoy/version.sh ${ENVOY_TAG})
 ifeq ($(GOOS),linux)
 	ENVOY_DISTRO ?= alpine
 endif
-ENVOY_DISTRO ?= ${GOOS}
+ENVOY_DISTRO ?= $(GOOS)
+
+ifeq ($(ENVOY_DISTRO),centos)
+	BUILD_ENVOY_SCRIPT = $(KUMA_DIR)/tools/envoy/build_centos.sh
+endif
+BUILD_ENVOY_SCRIPT ?= $(KUMA_DIR)/tools/envoy/build_$(GOOS).sh
 
 SOURCE_DIR ?= ${TMPDIR}envoy-sources
 ifndef TMPDIR
@@ -43,7 +48,7 @@ ifeq ($(BUILD_ENVOY_FROM_SOURCES),true)
 	SOURCE_DIR=${SOURCE_DIR} \
 	KUMA_DIR=${KUMA_DIR} \
 	BAZEL_BUILD_EXTRA_OPTIONS=${BAZEL_BUILD_EXTRA_OPTIONS} \
-	BINARY_PATH=$@ ${KUMA_DIR}/tools/envoy/build_${ENVOY_DISTRO}.sh
+	BINARY_PATH=$@ $(BUILD_ENVOY_SCRIPT)
 else
 	ENVOY_VERSION=${ENVOY_VERSION} \
 	ENVOY_DISTRO=${ENVOY_DISTRO} \

diff --git a/tools/envoy/build_darwin.sh b/tools/envoy/build_darwin.sh
@@ -19,7 +19,7 @@ BAZEL_BUILD_OPTIONS=(
     --show_task_finish
     --verbose_failures
     --//contrib/vcl/source:enabled=false
-    "--action_env=PATH=/usr/local/bin:/opt/local/bin:/usr/bin:/bin"
+    "--action_env=PATH=/usr/local/bin:/opt/local/bin:/usr/bin:/bin:/opt/homebrew/bin"
     "--define" "wasm=disabled"
     "${BAZEL_BUILD_EXTRA_OPTIONS[@]+"${BAZEL_BUILD_EXTRA_OPTIONS[@]}"}")
 bazel build "${BAZEL_BUILD_OPTIONS[@]}" -c opt //contrib/exe:envoy-static