Bug 126792 - Fix CharsetData.cpp build for iOS
Summary: Fix CharsetData.cpp build for iOS
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Simon Fraser (smfr)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-10 16:29 PST by Simon Fraser (smfr)
Modified: 2014-01-10 16:54 PST (History)
1 user (show)

See Also:

Attachments
Patch (4.49 KB, patch)
2014-01-10 16:31 PST, Simon Fraser (smfr) 		mrowe: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Simon Fraser (smfr) 2014-01-10 16:29:29 PST 
Fix CharsetData.cpp build for iOS
Comment 1 Simon Fraser (smfr) 2014-01-10 16:31:17 PST 
Created attachment 220905 [details]
Patch
Comment 2 Mark Rowe (bdash) 2014-01-10 16:34:51 PST 
Comment on attachment 220905 [details]
Patch

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

r=me

> Source/WebCore/DerivedSources.make:1194
> +ifeq ($(WTF_PLATFORM_IOS),1)
> +
> +CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/ios-encodings.txt
> +	perl $^ kTextEncoding > $@
> +
> +else
> +
>  CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/mac-encodings.txt
>  	perl $^ kTextEncoding > $@
>  
> +endif # WTF_PLATFORM_IOS

Can we avoid some of the duplication by pulling the path to the encodings file in to a variable instead?
Comment 3 Simon Fraser (smfr) 2014-01-10 16:54:33 PST 
http://trac.webkit.org/changeset/161698