Title: [191032] trunk/Tools
- Revision
- 191032
- Author
- mmaxfi...@apple.com
- Date
- 2015-10-13 22:10:51 -0700 (Tue, 13 Oct 2015)
Log Message
[iOS] Build fix
Unreviewed.
Mach-O section names are limited to 16 characters.
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
* DumpRenderTree/mac/DumpRenderTree.mm:
(activateFontsIOS):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (191031 => 191032)
--- trunk/Tools/ChangeLog 2015-10-14 04:54:37 UTC (rev 191031)
+++ trunk/Tools/ChangeLog 2015-10-14 05:10:51 UTC (rev 191032)
@@ -1,3 +1,15 @@
+2015-10-13 Myles C. Maxfield <mmaxfi...@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 <a...@apple.com>
Build fix for mac-debug EWS queue.
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (191031 => 191032)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2015-10-14 04:54:37 UTC (rev 191031)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2015-10-14 05:10:51 UTC (rev 191032)
@@ -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 _javascript_Core -framework WebKit $(OTHER_LDFLAGS_FONTS);
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (191031 => 191032)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-10-14 04:54:37 UTC (rev 191031)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-10-14 05:10:51 UTC (rev 191032)
@@ -632,8 +632,8 @@
fontData(WeightWatcher700);
fontData(WeightWatcher800);
fontData(WeightWatcher900);
- fontData(FontWithFeaturesTTF);
- fontData(FontWithFeaturesOTF);
+ fontData(FWFTTF);
+ fontData(FWFOTF);
}
#endif // !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
