diff --git a/configure.in b/configure.in
index 2a27996be565..730a3c68d6bf 100644
--- a/configure.in
+++ b/configure.in
@@ -6004,7 +6004,7 @@ if test "$MOZ_GAMEPAD"; then
             if ! test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_DIRECTX_SDK_CPU_SUFFIX/dxguid.lib ; then
                MOZ_GAMEPAD=
             fi
-        else
+        elif test "$GCC" != "yes"; then
             MOZ_GAMEPAD=
         fi
         if test -z "$MOZ_GAMEPAD"; then
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index ecbacabca4ea..bef3c62deb68 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -617,11 +617,15 @@ EXTRA_DSO_LDOPTS += -DELAYLOAD:msdmo.dll
 endif
 endif
 ifdef MOZ_GAMEPAD
+ifndef GNU_CC
 DXSDK := $(subst \,/,$(MOZ_DIRECTX_SDK_PATH))/Lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)
 OS_LIBS += \
   "$(DXSDK)/dxguid.lib" \
   "$(DXSDK)/dinput8.lib" \
   $(NULL)
+else
+OS_LIBS += $(call EXPAND_LIBNAME,dxguid dinput8)
+endif
 endif
 endif # WINNT