diff --git a/Makefile b/Makefile
index 7ade89f8..c1d7c45f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,3 @@
-# Ensure tools/kconfig submodule is initialized
-ifeq ($(wildcard tools/kconfig/menuconfig.py),)
-    $(shell git submodule update --init tools/kconfig)
-endif
-
 -include .config
 
 check_goal := $(strip $(MAKECMDGOALS))
@@ -189,7 +184,12 @@ endif
 
 KCONFIGLIB := tools/kconfig/kconfiglib.py
 $(KCONFIGLIB):
-	git submodule update --init tools/kconfig
+	@if [ -d .git ]; then \
+	    git submodule update --init tools/kconfig; \
+	else \
+	    echo "Error: Kconfig tools not found"; \
+	    exit 1; \
+	fi
 
 # Load default configuration
 .PHONY: defconfig
diff --git a/mk/common.mk b/mk/common.mk
index 6ffb3c95..000e5694 100644
--- a/mk/common.mk
+++ b/mk/common.mk
@@ -308,7 +308,7 @@ _cmd_compile.cxx.host     = $(HOSTCXX) $(__HOSTARCHFLAGS) $(__CXXFLAGS) $($1_arc
                             $$($1_$$<_cxxflags-y) $($1_includes) -c -o $$@ $$<
 _cmd_link.cxx.host        = $(HOSTCXX) $(__HOSTARCHFLAGS) $(__CXXFLAGS) $($1_libraries) -o $$@ $$(filter-out __FORCE $($1_depends_y),$$^) \
                             $($1_archflags) $($1_ldflags) $(__LDFLAGS)
-_cmd_link_so.cxx.host     = $(HOSTCXX) $(__HOSTARCHFLAGS) $(__CXXFLAGS)$($1_libraries) -o $$@ $$(filter-out __FORCE $($1_depends_y),$$^) \
+_cmd_link_so.cxx.host     = $(HOSTCXX) $(__HOSTARCHFLAGS) $(__CXXFLAGS) $($1_libraries) -o $$@ $$(filter-out __FORCE $($1_depends_y),$$^) \
                             $($1_archflags) $($1_ldflags) $$(filter-out -static,$(__LDFLAGS)) -shared $$(if $($1_soname-y),-Wl$$(comma)-soname$$(comma)$($1_soname-y),)
 
 _cmd_ar                   = $(AR) rcs $$@ $$(filter-out __FORCE $($1_depends_y),$$^)
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index e3251d76..ff0c89a7 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -25,7 +25,7 @@ ifndef CXX
 CXX := $(CROSS_COMPILE)g++
 endif
 ifeq ("$(CC_IS_CLANG)", "1")
-override CXX := $(dir $(CC))$(subst clang,clang++,$(notdir $(CC)))
+override CXX := $(subst clang,clang++,$(CC))
 endif
 
 ifndef CPP
@@ -81,5 +81,5 @@ HOSTSTRIP := $(HOST_COMPILE)strip
 endif
 
 ifndef HOSTOBJCOPY
-HOSTOBJCOPY:= $(HOST_COMPILE)objcpy
+HOSTOBJCOPY := $(HOST_COMPILE)objcopy
 endif