diff --git a/Makefile b/Makefile
index c127046f6..6f5c5bec0 100644
--- a/Makefile
+++ b/Makefile
@@ -442,14 +442,13 @@ ifdef LLAMA_HIPBLAS
 
 	ifeq ($(wildcard /opt/rocm),)
 		ROCM_PATH	?= /usr
-		HIPCC	    ?= $(ROCM_PATH)/bin/hipcc
-		GPU_TARGETS ?= $(shell $(ROCM_PATH)/bin/amdgpu-arch)
+		GPU_TARGETS ?= $(shell which amdgpu-arch)
 	else
 		ROCM_PATH	?= /opt/rocm
-		HIPCC	    ?= $(ROCM_PATH)/bin/hipcc
 		GPU_TARGETS ?= $(shell $(ROCM_PATH)/llvm/bin/amdgpu-arch)
 	endif
 	
+	HIPCC	    			?= $(ROCM_PATH)/bin/hipcc
 	LLAMA_CUDA_DMMV_X       ?= 32
 	LLAMA_CUDA_MMV_Y        ?= 1
 	LLAMA_CUDA_KQUANTS_ITER ?= 2