From b026bc386918c7a9df8b04b4efdf92cc6c506690 Mon Sep 17 00:00:00 2001
From: kanjoe24 <165808281+kanjoe24@users.noreply.github.com>
Date: Fri, 19 Dec 2025 14:15:33 +0000
Subject: [PATCH] Add : gh #231: Add changes for makefile chnages in ut-control

---
 Makefile | 4 +++-
 build.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ca9ce90..8cecf11 100755
--- a/Makefile
+++ b/Makefile
@@ -94,8 +94,10 @@ COMPILER := $(if $(filter CPP,$(VARIANT)),$(CXX),$(CC))
 #CC := arm-rdk-linux-gnueabi-gcc -mthumb -mfpu=vfp -mcpu=cortex-a9 -mfloat-abi=soft -mabi=aapcs-linux -mno-thumb-interwork -ffixed-r8 -fomit-frame-pointer
 # CFLAGS will be overriden by Caller as required
 INC_DIRS += $(UT_CORE_DIR)/sysroot/usr/include
+UT_CONTROL_COMPILER := $(CC)
 else
 COMPILER := $(if $(filter CPP,$(VARIANT)),g++ -ggdb -o0 -Wall, gcc -ggdb -o0 -Wall)
+UT_CONTROL_COMPILER := gcc -ggdb -o0 -Wall
 endif
 
 # Common object file setup
@@ -142,7 +144,7 @@ download_and_build:
 	@${UT_CORE_DIR}/build.sh TARGET=${TARGET} VARIANT=${VARIANT}
 	@${ECHOE} ${GREEN}Completed${NC}
 	@${ECHOE} ${GREEN}Entering ut-control [TARGET=${TARGET}]${NC}
-	@${MAKE} -C $(UT_CONTROL) TARGET=${TARGET}
+	@${MAKE} -C $(UT_CONTROL) TARGET=${TARGET} CC="${UT_CONTROL_COMPILER}"
 
 # Build the test binary
 test: $(OBJS) createdirs $(if $(BUILD_WEAK_STUBS_SRC),$(WEAK_STUBS_LIB))
diff --git a/build.sh b/build.sh
index 2352db7..158064e 100755
--- a/build.sh
+++ b/build.sh
@@ -67,7 +67,7 @@ popd > /dev/null # ${MY_DIR}
 # Therefore in that case it warns you but doesnt' chnage to that version, which could cause your tests to break.
 # Change this to upgrade your ut-control Major versions. Non ABI Changes 1.x.x are supported, between major revisions
 
-UT_CONTROL_PROJECT_VERSION="2.0.0"  # Fixed version
+UT_CONTROL_PROJECT_VERSION="feature/gh109_Makefile_Update_avoid_hardcodedpaths"  # Fixed version
 
 # Clone the Unit Test Requirements
 UT_CONTROL_REPO=git@github.com:rdkcentral/ut-control.git