Bug 1475566 Disable #pragma comments for MinGW Builds r=glandium

In the MinGW browser build job, we're going to use -fms-extensions,
which will tell clang to start processing these comments. Clang
cannot process them correctly (it's an upstream bug) but it doesn't
need to, because we include the libs we need in moz.build files.

So we exclude them for MinGW builds. mingw-clang gets them wrong and
mingw-gcc (which doesn't even work anymore on -central) ignored them.

In the future, with a llvm fix, we could clean up the moz.build
files and re-enable these comments.

Differential Revision: https://phabricator.services.mozilla.com/D3527

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tom Ritter 2018-08-29 03:50:39 +00:00
Родитель eb68a1e6db
Коммит 7e0fefeaa0
6 изменённых файлов: 13 добавлений и 2 удалений

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

@ -38,7 +38,9 @@
#include "base/time.h"
#ifndef __MINGW32__
#pragma comment(lib, "winmm.lib")
#endif
#include <windows.h>
#include <mmsystem.h>

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

@ -24,8 +24,10 @@
#define INITGUID
#include <guiddef.h>
#ifndef __MINGW32__
#pragma comment(lib, "mfuuid.lib")
#pragma comment(lib, "wmcodecdspuuid")
#endif
void LOG(const char* format, ...)
{

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

@ -42,7 +42,9 @@
// Link w/ subsystem windows so we don't get a console when executing
// this binary.
#ifndef __MINGW32__
#pragma comment(linker, "/SUBSYSTEM:windows /ENTRY:wmainCRTStartup")
#endif
using namespace Gdiplus;

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

@ -8,11 +8,13 @@
#include <userenv.h>
#include <shellapi.h>
#ifndef __MINGW32__
#pragma comment(lib, "wtsapi32.lib")
#pragma comment(lib, "userenv.lib")
#pragma comment(lib, "shlwapi.lib")
#pragma comment(lib, "ole32.lib")
#pragma comment(lib, "rpcrt4.lib")
#endif
#include "mozilla/CmdLineAndEnvUtils.h"
#include "nsWindowsHelpers.h"

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

@ -6,9 +6,10 @@
#include "WindowsNetworkFunctionsWrapper.h"
#ifndef __MINGW32__
#pragma comment(lib, "IPHLPAPI.lib")
#pragma comment(lib, "dhcpcsvc.lib" )
#endif
namespace mozilla {
namespace toolkit {
@ -43,4 +44,4 @@ DWORD WindowsNetworkFunctionsWrapper::DhcpRequestParamsWrapped(
} // namespace windowsDHCPClient
} // namespace system
} // namespace toolkit
} // namespace mozilla
} // namespace mozilla

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

@ -18,7 +18,9 @@
// Needed for CreateEnvironmentBlock
#include <userenv.h>
#ifndef __MINGW32__
#pragma comment(lib, "userenv.lib")
#endif
/**
* Convert UTF8 to UTF16 without using the normal XPCOM goop, which we