Use MOZ_FIND_WINSDK_VERSION for MOZ_WINSDK_MAXVER on mingw.

RESOLVED FIXED in Firefox 44

Status

()

Core
Build Config
RESOLVED FIXED
3 years ago
2 years ago

People

(Reporter: Jacek Caban, Assigned: Jacek Caban)

Tracking

Trunk
mozilla44
Points:
---

Firefox Tracking Flags

(firefox43 affected, firefox44 fixed)

Details

Attachments

(1 attachment, 2 obsolete attachments)

(Assignee)

Description

3 years ago
Created attachment 8651129 [details] [diff] [review]
patch.diff

In general, if something doesn't work because we build with win10 support, it should be fixed in mingw. Also, without the patch, there are WMF build failures with recent mingw (which supports GUIDs that are redefined in m-c sources).
Attachment #8651129 - Flags: review?(mh+mozilla)
Comment on attachment 8651129 [details] [diff] [review]
patch.diff

Review of attachment 8651129 [details] [diff] [review]:
-----------------------------------------------------------------

Why not just use MOZ_FIND_WINSDK_VERSION ?
Attachment #8651129 - Flags: review?(mh+mozilla)
(Assignee)

Updated

3 years ago
Summary: Set MOZ_WINSDK_MAXVER to win10 for mingw. → Use MOZ_FIND_WINSDK_VERSION for MOZ_WINSDK_MAXVER on mingw.
(Assignee)

Comment 2

3 years ago
Created attachment 8654498 [details] [diff] [review]
fix

Agreed. The attached patch does that. We use $CPP to find the version, but AC_PROG_CPP is invoked a bit later, so I had to change that.
Attachment #8651129 - Attachment is obsolete: true
Attachment #8654498 - Flags: review?(mh+mozilla)
Comment on attachment 8654498 [details] [diff] [review]
fix

Review of attachment 8654498 [details] [diff] [review]:
-----------------------------------------------------------------

::: configure.in
@@ +748,5 @@
>      fi # !GNU_CC
> +esac
> +
> +AC_PROG_CPP
> +AC_PROG_CXXCPP

You'd spare yourself of the esac/case thing if you just moved those above the original case, which afaict should work.

::: js/src/configure.in
@@ +472,3 @@
>  
> +case "$target" in
> +*-mingw*)

Closing the case to reopen it is not very useful here.
Attachment #8654498 - Flags: review?(mh+mozilla)
(Assignee)

Comment 4

3 years ago
Created attachment 8656565 [details] [diff] [review]
fix
Attachment #8654498 - Attachment is obsolete: true
Attachment #8656565 - Flags: review?(mh+mozilla)
Attachment #8656565 - Flags: review?(mh+mozilla) → review+
https://hg.mozilla.org/mozilla-central/rev/6d4dec769065
Status: NEW → RESOLVED
Last Resolved: 2 years ago
status-firefox44: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla44
You need to log in before you can comment on or make changes to this bug.