--- a/testing/tools/fileid/moz.build
+++ b/testing/tools/fileid/moz.build
@@ -1,15 +1,25 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-GeckoProgram('fileid', linkage=None, msvcrt='static')
+if CONFIG['OS_ARCH'] == 'WINNT':
+    Program('fileid')
+    USE_STATIC_LIBS = True
+    SOURCES += ['win_fileid.cpp']
+    OS_LIBS += ['dbghelp']
+    NO_PGO = True
+else:
+    # Technically, it's not a GeckoProgram (thus linkage=None), but it needs
+    # mozglue because of the breakpad code it uses being compiled for gecko
+    # and requiring infallible malloc.
+    GeckoProgram('fileid', linkage=None)
 
 if CONFIG['OS_ARCH'] == 'Linux':
     USE_LIBS += [
         'breakpad_linux_common_s',
     ]
     SOURCES += ['linux_fileid.cpp']
 
 
@@ -23,12 +33,8 @@ if CONFIG['OS_ARCH'] == 'Darwin':
 if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'Darwin':
     USE_LIBS += [
         'breakpad_common_s',
     ]
     LOCAL_INCLUDES += [
         '/toolkit/crashreporter/google-breakpad/src',
     ]
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += ['win_fileid.cpp']
-    OS_LIBS += ['dbghelp']
-    NO_PGO = True