Merge pull request #6742 from Amulyam24/agent-build

runtime: remove overriding ARCH value by default for ppc64le

src/agent/Makefile

@@ -33,6 +33,12 @@ ifeq ($(SECCOMP),yes)
     override EXTRA_RUSTFEATURES += seccomp
 endif
 
+include ../../utils.mk
+
+ifeq ($(ARCH), ppc64le)
+    override ARCH = powerpc64le
+endif
+
 ##VAR STANDARD_OCI_RUNTIME=yes|no define if agent enables standard oci runtime feature
 STANDARD_OCI_RUNTIME := no
 
@@ -45,8 +51,6 @@ ifneq ($(EXTRA_RUSTFEATURES),)
     override EXTRA_RUSTFEATURES := --features "$(EXTRA_RUSTFEATURES)"
 endif
 
-include ../../utils.mk
-
 TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
 
 ##VAR DESTDIR=<path> is a directory prepended to each installed target file

src/runtime-rs/Makefile

@@ -17,6 +17,10 @@ CONTAINERD_RUNTIME_NAME = io.containerd.kata.v2
 
 include ../../utils.mk
 
+ifeq ($(ARCH), ppc64le)
+    override ARCH = powerpc64le
+endif
+
 ARCH_DIR = arch
 ARCH_FILE_SUFFIX = -options.mk
 ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX)

src/tools/agent-ctl/Makefile

@@ -5,6 +5,10 @@
 
 include ../../../utils.mk
 
+ifeq ($(ARCH), ppc64le)
+     override ARCH = powerpc64le
+ endif
+
 .DEFAULT_GOAL := default
 default: build
 

src/tools/runk/Makefile

@@ -8,6 +8,10 @@ LIBC ?= gnu
 
 include ../../../utils.mk
 
+ifeq ($(ARCH), ppc64le)
+     override ARCH = powerpc64le
+ endif
+
 TARGET = runk
 TARGET_PATH = target/$(TRIPLE)/$(BUILD_TYPE)/$(TARGET)
 AGENT_SOURCE_PATH = ../../agent

src/tools/trace-forwarder/Makefile

@@ -5,6 +5,10 @@
 
 include ../../../utils.mk
 
+ifeq ($(ARCH), ppc64le)
+     override ARCH = powerpc64le
+ endif
+
 .DEFAULT_GOAL := default
 default: build
 

utils.mk

@@ -146,7 +146,6 @@ ifneq ($(LIBC),musl)
 endif
 
 ifeq ($(ARCH), ppc64le)
-    override ARCH = powerpc64le
     override LIBC = gnu
     $(warning "WARNING: powerpc64le-unknown-linux-musl target is unavailable")
 endif