Build ASan WebKit for iOS Simulator

https://bugs.webkit.org/show_bug.cgi?id=133489

Reviewed by Darin Adler.

* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
- Add missing ASan LDFLAGS.
* asan/asan.xcconfig:
- Split compiler-rt linker flags for OS X and iOS Simulator

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 38841d296d4a31323ba53c16d2977494ec5d009b..11c7943b59ebe92f0c3e79f94121d34bc1f6fb83 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2014-06-04  David Farler  <dfarler@apple.com>
+
+        Build ASan WebKit for iOS Simulator
+        https://bugs.webkit.org/show_bug.cgi?id=133489
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+        * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+        - Add missing ASan LDFLAGS.
+        * asan/asan.xcconfig:
+        - Split compiler-rt linker flags for OS X and iOS Simulator
+
 2014-06-03  Yoav Weiss  <yoav@yoav.ws>
 
         Add myself (yoav@yoav.ws) to contributors.json

diff --git a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
index 9ab17c48d7bbdaefefb392c323726e1445b8d0cb..eca60d8f0d9e40c7b4dac65cc93bfecea5a68343 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
@@ -23,7 +23,7 @@
 
 #include "BaseTarget.xcconfig"
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(ASAN_OTHER_LDFLAGS);
 OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework QuartzCore -framework WebKit;
 LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
 PRODUCT_NAME = DumpRenderTree;

diff --git a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
index 3335b39b6b5382e5be9ede0a70ae770e1ac39700..3b53a6e33888428a8c93a3856991871b0979881d 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig
@@ -27,7 +27,7 @@
 
 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 HiraMaruMono-W4 fonts/SampleFont.sfont;
 
-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(ASAN_OTHER_LDFLAGS);
 OTHER_LDFLAGS_iphoneos = $(inherited) -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);
 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
 LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";

diff --git a/Tools/asan/asan.xcconfig b/Tools/asan/asan.xcconfig
index 8b29fbcfeabcb0e9a1e5e4b1f4e45cf15a6f24bc..6eddefaa3d24156e2cd2ec4979fc3d45f34865f5 100644 (file)
--- a/Tools/asan/asan.xcconfig
+++ b/Tools/asan/asan.xcconfig
@@ -2,4 +2,6 @@ GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 
 ASAN_OTHER_CFLAGS = -fsanitize=address -O1 -mllvm -asan-blacklist=$(ASAN_IGNORE) -Wno-error -fno-omit-frame-pointer -g -DUSE_SYSTEM_MALLOC=1;
 ASAN_OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CFLAGS);
-ASAN_OTHER_LDFLAGS = -fsanitize=address -lclang_rt.asan_osx_dynamic;
+ASAN_OTHER_LDFLAGS = -fsanitize=address $(ASAN_OTHER_LDFLAGS_$(PLATFORM_NAME));
+ASAN_OTHER_LDFLAGS_macosx = -lclang_rt.asan_osx_dynamic;
+ASAN_OTHER_LDFLAGS_iphonesimulator = -lclang_rt.asan_iossim_dynamic;