diff --git a/CLI/klish/Makefile b/CLI/klish/Makefile
index 76577b5..c0fe1a8 100644
--- a/CLI/klish/Makefile
+++ b/CLI/klish/Makefile
@@ -7,12 +7,19 @@ PYTHONVER=3.7
 
 KLISH_SRC = $(SONIC_CLI_ROOT)/klish-$(KLISH_VERSION)
 
+ifeq ($(CROSS_BUILD_ENVIRON),y)
+	CROSS_CONFIGURE_OPTS = --host=$(CROSS_HOST_TYPE)
+	LIB_PATH = $(CROSS_PKGS_LIB_PATH)
+else
+	LIB_PATH = /usr/lib/x86_64-linux-gnu
+endif
+
 SRC_REPLACEMENTS:=$(shell find patches -type f)
 all : $(SRC_REPLACEMENTS)
 	tar xzvf klish-$(KLISH_VERSION).tgz -C $(SONIC_CLI_ROOT)
 	./patches/scripts/patchmake.sh -p VER=${KLISH_VERSION} TSP=${SONIC_CLI_ROOT} DSP=${CURDIR}/patches TWP=${SONIC_CLI_ROOT}
 
-	cd ${KLISH_SRC} && sh autogen.sh && ./configure --with-libxml2=/usr --enable-debug=no LIBS='-l:libcurl-gnutls.so.4 -L/usr/lib/x86_64-linux-gnu -lpython3.7m -Wl,-rpath=/usr/lib/x86_64-linux-gnu -lcjson' CFLAGS='${CFLAGS} -g -I/usr/include/python3.7m' CPPFLAGS='${CPPFLAGS} -I/usr/include/cjson' && make
+	cd ${KLISH_SRC} && sh autogen.sh && ./configure --with-libxml2=/usr $(CROSS_CONFIGURE_OPTS) --enable-debug=no LIBS='-l:libcurl-gnutls.so.4 -L$(LIB_PATH) -lpython3.7m -Wl,-rpath=$(LIB_PATH) -lcjson' CFLAGS='${CFLAGS} -g -I/usr/include/python3.7m' CPPFLAGS='${CPPFLAGS} -I/usr/include/cjson' && make
 
 	mkdir -p $(SONIC_CLI_ROOT)/target/.libs
 	cp $(CURDIR)/clish_start $(SONIC_CLI_ROOT)/target/.