зеркало из https://github.com/mozilla/gecko-dev.git
Move the initialization of the global component info variable for static build so that --version works.
Bug #120080 r=dbaron sr=alecf
This commit is contained in:
Родитель
1187514cf8
Коммит
27f9ee0d67
|
@ -1514,6 +1514,11 @@ int main(int argc, char* argv[])
|
|||
InitializeMacOSXApp(argc, argv);
|
||||
#endif
|
||||
|
||||
#ifdef _BUILD_STATIC_BIN
|
||||
// Initialize XPCOM's module info table
|
||||
NSGetStaticModuleInfo = apprunner_getModuleInfo;
|
||||
#endif
|
||||
|
||||
// Handle -help and -version command line arguments.
|
||||
// They should% return quick, so we deal with them here.
|
||||
if (HandleDumpArguments(argc, argv))
|
||||
|
@ -1566,11 +1571,6 @@ int main(int argc, char* argv[])
|
|||
splash->Show();
|
||||
}
|
||||
|
||||
#ifdef _BUILD_STATIC_BIN
|
||||
// Initialize XPCOM's module info table
|
||||
NSGetStaticModuleInfo = apprunner_getModuleInfo;
|
||||
#endif
|
||||
|
||||
NS_TIMELINE_MARK("InitXPCom...");
|
||||
|
||||
rv = NS_InitXPCOM2(NULL, NULL, NULL);
|
||||
|
|
Загрузка…
Ссылка в новой задаче