Closed Bug 1359552 Opened 3 years ago Closed 3 years ago

Angle Build Broken on MinGW

Categories

(Firefox Build System :: General, enhancement)

52 Branch
enhancement
Not set

Tracking

(firefox55 fixed)

RESOLVED FIXED
mozilla55
Tracking Status
firefox55 --- fixed

People

(Reporter: tjr, Assigned: tjr)

References

(Blocks 1 open bug)

Details

(Whiteboard: [tor])

Attachments

(1 file)

In Bug 1314979, I turned off an Angle-related section of old-configure.in when we were compiling on Linux with MinGW for Windows. I did this thinking it was unneeded; and since the section errorred about the lack of a Windows SDK being present, that was the way to fix the error.

That was a mistake. We need to hit that section to set MOZ_HAS_WINSDK_WITH_D3D - if that define is not set we don't include d3d11.h which (surprise) is required for stuff.  

The mistake about why the patch worked or not was caused by some confusion about the state of my tree while waiting for Bug 1331335 to get reviewed.
Comment on attachment 8861570 [details]
Bug 1359552 ANGLE requires MOZ_HAS_WINSDK_WITH_D3D to be set for required includes in MINGW

https://reviewboard.mozilla.org/r/133536/#review137074

glandium is on holiday. So stealing this review so it doesn't sit idle.

This change looks fine. Thank you for writing a good commit message.

You can ignore the indentation nit if you want: it shouldn't be relevant.

::: old-configure.in:3132
(Diff revision 1)
>  
>  if test "$COMPILE_ENVIRONMENT" ; then
>  case "$target_os" in
>  *mingw*)
> -    if test "$OS_ARCH" = "$HOST_OS_ARCH"; then
>        MOZ_ANGLE_RENDERER=1

This line should be unindented.
Attachment #8861570 - Flags: review+
hg error in cmd: hg rebase -s 50fd9cf1d1fd -d 1219abce0035: abort: can't rebase public changeset 50fd9cf1d1fd
(see 'hg help phases' for details)
hg error in cmd: hg rebase -s 50fd9cf1d1fd -d c2b3ef7f8efe: abort: can't rebase public changeset 50fd9cf1d1fd
(see 'hg help phases' for details)
Pushed by kwierso@gmail.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/21fb5fb40df5
ANGLE requires MOZ_HAS_WINSDK_WITH_D3D to be set for required includes in MINGW r=gps
Unsure what was wrong with autoland. I just pushed the patch to inbound instead.
https://hg.mozilla.org/mozilla-central/rev/21fb5fb40df5
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla55
Comment on attachment 8861570 [details]
Bug 1359552 ANGLE requires MOZ_HAS_WINSDK_WITH_D3D to be set for required includes in MINGW

https://reviewboard.mozilla.org/r/133536/#review140410

::: old-configure.in:3164
(Diff revision 2)
>    fi
>  
>    ######################################
>    # Find _46+ for use by Vista+.
>  
>    # Find a D3D compiler DLL in a Windows SDK.

If you ignore the error, you might as well skip the entire test.

That being said, on reflection, it seems like we should still require the d3d compiler dll for those builds... except if the gfx team says otherwise.
Attachment #8861570 - Flags: review?(mh+mozilla)
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.