Bug 217584 – Ignore deployment suffix and identifier when computing major OS version for macOS Big Sur and newer

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Luming Yin]

<rdar://problem/70168426>

[Luming Yin]

Created attachment 411064 [details]
Patch

[EWS Watchlist]

Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE

[Darin Adler]

Comment on attachment 411064 [details]
Patch

The build is not failing, but we know that this version is wrong.

[Luming Yin]

Created attachment 411066 [details]
Patch

[Darin Adler]

Comment on attachment 411066 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=411066&action=review

> Source/JavaScriptCore/Configurations/Base.xcconfig:106
> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = $(MACOSX_DEPLOYMENT_TARGET:identifier)

We just figured out this does not work!

[Luming Yin]

Created attachment 411070 [details]
Patch

[Darin Adler]

EWS is not going to tell us anything here, because these changes affect only Production builds. EWS does Debug and Release builds.

[Darin Adler]

Comment on attachment 411070 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=411070&action=review

> Source/JavaScriptCore/Configurations/Base.xcconfig:106
> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = $(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)

I think this should use "10" instead of "$(MACOSX_DEPLOYMENT_TARGET:base)"

[Luming Yin]

Created attachment 411072 [details]
Patch

[Luming Yin]

(In reply to Darin Adler from comment #8)
> Comment on attachment 411070 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=411070&action=review
> 
> > Source/JavaScriptCore/Configurations/Base.xcconfig:106
> > +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = $(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
> 
> I think this should use "10" instead of "$(MACOSX_DEPLOYMENT_TARGET:base)"

Good idea. Patch updated to use "10" instead.

[Keith Rollin]

Comment on attachment 411072 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=411072&action=review

> Source/JavaScriptCore/Configurations/Base.xcconfig:106
> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)

I've never seen "a = b = c" in an xcconfig file before. Especially when it's "a = a = c". Is this correct, or a copy/paste error?

[Luming Yin]

(In reply to Keith Rollin from comment #11)
> Comment on attachment 411072 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=411072&action=review
> 
> > Source/JavaScriptCore/Configurations/Base.xcconfig:106
> > +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
> 
> I've never seen "a = b = c" in an xcconfig file before. Especially when it's
> "a = a = c". Is this correct, or a copy/paste error?

Uh-oh. Copy/paste error. Uploading another patch.

[Darin Adler]

Comment on attachment 411072 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=411072&action=review

>>> Source/JavaScriptCore/Configurations/Base.xcconfig:106
>>> +TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
>> 
>> I've never seen "a = b = c" in an xcconfig file before. Especially when it's "a = a = c". Is this correct, or a copy/paste error?
> 
> Uh-oh. Copy/paste error. Uploading another patch.

Good catch! It’s right in ANGLE but wrong in the others.

[Luming Yin]

Created attachment 411073 [details]
Patch

[EWS]

Committed r268327: <https://trac.webkit.org/changeset/268327>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 411073 [details].