Summary: | Always assume internal SDK when building configuration Production | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Daniel Bates <dbates> | ||||||||
Component: | Tools / Tests | Assignee: | Daniel Bates <dbates> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | ddkilzer, mitz, mrowe | ||||||||
Priority: | P2 | Keywords: | InRadar | ||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | iPhone / iPad | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
Daniel Bates
2014-09-18 10:28:39 PDT
Created attachment 238314 [details]
Patch
Created attachment 238328 [details]
Alternative Patch
Inspired by a suggestion by Mark Rowe. Define USE_INTERNAL_SDK to always be YES when building configuration Production. Otherwise, define it in terms of HAVE_INTERNAL_SDK.
Comment on attachment 238328 [details] Alternative Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238328&action=review > Source/JavaScriptCore/Configurations/Base.xcconfig:31 > +USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION)); > +USE_INTERNAL_SDK_Production = YES; > +USE_INTERNAL_SDK_Debug = $(USE_INTERNAL_SDK_Debug_or_Release); > +USE_INTERNAL_SDK_Release = $(USE_INTERNAL_SDK_Debug_or_Release); > +USE_INTERNAL_SDK_Debug_or_Release = $(HAVE_INTERNAL_SDK); Not sure the extra level of indirection is helping here. Simply defining USE_INTERNAL_SDK_Debug and USE_INTERNAL_SDK_Release directly in terms of HAVE_INTERNAL_SDK would have worked as well. (In reply to comment #4) > (From update of attachment 238328 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238328&action=review > > > Source/JavaScriptCore/Configurations/Base.xcconfig:31 > > +USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION)); > > +USE_INTERNAL_SDK_Production = YES; > > +USE_INTERNAL_SDK_Debug = $(USE_INTERNAL_SDK_Debug_or_Release); > > +USE_INTERNAL_SDK_Release = $(USE_INTERNAL_SDK_Debug_or_Release); > > +USE_INTERNAL_SDK_Debug_or_Release = $(HAVE_INTERNAL_SDK); > > Not sure the extra level of indirection is helping here. Simply defining USE_INTERNAL_SDK_Debug and USE_INTERNAL_SDK_Release directly in terms of HAVE_INTERNAL_SDK would have worked as well. Will fix before landing. Created attachment 238340 [details]
Patch
Committed r173763: <http://trac.webkit.org/changeset/173763> |