Bug 1423094 - Remove last use of msvcrt='static'. r=gps

--HG--
extra : rebase_source : 27f2d3976c63756b07a5527062892b4218715477
This commit is contained in:
Mike Hommey 2017-12-05 15:34:58 +09:00
Родитель 6b3554dc84
Коммит d341ad4fd1
1 изменённых файлов: 11 добавлений и 5 удалений

Просмотреть файл

@ -4,7 +4,17 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # 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': if CONFIG['OS_ARCH'] == 'Linux':
USE_LIBS += [ USE_LIBS += [
@ -28,7 +38,3 @@ if CONFIG['OS_ARCH'] == 'Linux' or CONFIG['OS_ARCH'] == 'Darwin':
'/toolkit/crashreporter/google-breakpad/src', '/toolkit/crashreporter/google-breakpad/src',
] ]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += ['win_fileid.cpp']
OS_LIBS += ['dbghelp']
NO_PGO = True