diff --git a/Makefile b/Makefile
index 65a61ed3..ddba8b78 100644
--- a/Makefile
+++ b/Makefile
@@ -181,10 +181,10 @@ endif
 # Qualcomm-specific code - start
 ifeq ($(ARCH),arm)
 ifeq ($(QUIC_ARM_BAREMETAL),yes)
-obj/crt/crt1.o : qualcomm-software/crt/arm/crt1_baremetal.s
+obj/crt/crt1.o : $(srcdir)/qualcomm-software/crt/arm/crt1_baremetal.s
 	$(AS_CMD)
 
-obj/crt/crt1_linux.o: qualcomm-software/crt/arm/crt1_linux.s
+obj/crt/crt1_linux.o: $(srcdir)/qualcomm-software/crt/arm/crt1_linux.s
 	$(AS_CMD)
 
 CRT_OBJS += obj/crt/crt1_linux.o
diff --git a/configure b/configure
index 3a4fa9ca..45a044cd 100755
--- a/configure
+++ b/configure
@@ -862,5 +862,8 @@ test "x$pic_default" = xyes && echo 'AOBJS = $(LOBJS)'
 exec 1>&3 3>&-
 
 test "$srcdir" = "." || ln -sf $srcdir/Makefile .
+# Qualcomm-specific code start
+test "$srcdir" = "." || ln -sf $srcdir/build_variants.mk .
+# Qualcomm-specific code end
 
 printf "done\n"