[iOS] Build fix

Unreviewed.

Mach-O section names are limited to 16 characters.

* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
* DumpRenderTree/mac/DumpRenderTree.mm:
(activateFontsIOS):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191032 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bc6d1c3..af75000 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2015-10-13  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [iOS] Build fix
+
+        Unreviewed.
+
+        Mach-O section names are limited to 16 characters.
+
+        * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (activateFontsIOS):
+
 2015-10-13  Alexey Proskuryakov  <ap@apple.com>
 
         Build fix for mac-debug EWS queue.

diff --git a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
index 0155715..e69e792 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
@@ -25,7 +25,7 @@
 
 #include "BaseTarget.xcconfig"
 
-OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA FontWithFeaturesTTF fonts/FontWithFeatures.ttf -sectcreate __DATA FontWithFeaturesOTF fonts/FontWithFeatures.otf;
+OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA FWFTTF fonts/FontWithFeatures.ttf -sectcreate __DATA FWFOTF fonts/FontWithFeatures.otf;
 
 OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
 PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);

diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
index 27732d5..163c6cb 100644 (file)
--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -632,8 +632,8 @@ static void activateFontsIOS()
     fontData(WeightWatcher700);
     fontData(WeightWatcher800);
     fontData(WeightWatcher900);
-    fontData(FontWithFeaturesTTF);
-    fontData(FontWithFeaturesOTF);
+    fontData(FWFTTF);
+    fontData(FWFOTF);
 }
 #endif // !PLATFORM(IOS)