diff --git a/make/gdb.mk b/make/gdb.mk
index 51eff8bc54..846035257f 100644
--- a/make/gdb.mk
+++ b/make/gdb.mk
@@ -17,7 +17,10 @@ $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
 
 $(GDB_DIR)/.configured: $(GDB_DIR)/.unpacked
 	(cd $(GDB_DIR); rm -rf config.cache; \
-		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
+		AS=$(TARGET_CROSS)as LD=$(TARGET_CROSS)ld \
+		RANLIB=$(TARGET_CROSS)ranlib NM=$(TARGET_CROSS)nm \
+		CC=$(TARGET_CC1) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--prefix=/usr \
@@ -30,6 +33,7 @@ $(GDB_DIR)/.configured: $(GDB_DIR)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
+		--includedir=$(STAGING_DIR)/include \
 		--disable-nls \
 		--without-uiout --disable-gdbmi \
 		--disable-tui --disable-gdbtk --without-x \
diff --git a/make/gdbserver.mk b/make/gdbserver.mk
index cfc834a200..575574c9de 100644
--- a/make/gdbserver.mk
+++ b/make/gdbserver.mk
@@ -12,7 +12,10 @@ GDB_WDIR:=$(BUILD_DIR)/gdbserver
 
 $(GDB_WDIR)/.configured: $(GDB_DIR)/.unpacked
 	(cd $(GDB_WDIR); rm -rf config.cache; \
-		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
+		PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
+		AS=$(TARGET_CROSS)as LD=$(TARGET_CROSS)ld \
+		RANLIB=$(TARGET_CROSS)ranlib NM=$(TARGET_CROSS)nm \
+		CC=$(TARGET_CC1) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--prefix=/usr \
@@ -25,6 +28,7 @@ $(GDB_WDIR)/.configured: $(GDB_DIR)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
+		--includedir=$(STAGING_DIR)/include \
 		--disable-nls \
 		--without-uiout --disable-gdbmi \
 		--disable-tui --disable-gdbtk --without-x \