diff options
Diffstat (limited to 'Source/WebKit2/Configurations')
| -rw-r--r-- | Source/WebKit2/Configurations/Base.xcconfig | 3 | ||||
| -rw-r--r-- | Source/WebKit2/Configurations/Version.xcconfig | 2 | ||||
| -rw-r--r-- | Source/WebKit2/Configurations/WebKit2.xcconfig | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit2/Configurations/Base.xcconfig b/Source/WebKit2/Configurations/Base.xcconfig index 4005a47..6f06a69 100644 --- a/Source/WebKit2/Configurations/Base.xcconfig +++ b/Source/WebKit2/Configurations/Base.xcconfig @@ -51,6 +51,9 @@ VALID_ARCHS = i386 x86_64; // FIXME: <rdar://problem/5070292> WebKit should build with -Wshorten-64-to-32 WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings; +// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols. +OTHER_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv; + REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME)); REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx); diff --git a/Source/WebKit2/Configurations/Version.xcconfig b/Source/WebKit2/Configurations/Version.xcconfig index 527486d..3095c3b 100644 --- a/Source/WebKit2/Configurations/Version.xcconfig +++ b/Source/WebKit2/Configurations/Version.xcconfig @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 20; +MINOR_VERSION = 24; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); diff --git a/Source/WebKit2/Configurations/WebKit2.xcconfig b/Source/WebKit2/Configurations/WebKit2.xcconfig index 01771c2..aa80bbc 100644 --- a/Source/WebKit2/Configurations/WebKit2.xcconfig +++ b/Source/WebKit2/Configurations/WebKit2.xcconfig @@ -29,6 +29,6 @@ INFOPLIST_FILE = Info.plist; // The framework location specified in mac/MainMac.cpp needs to be kept in sync with the install path. INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; -OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME)); +OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(REAL_PLATFORM_NAME)) $(OTHER_LDFLAGS); OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); OTHER_LDFLAGS_macosx_1070 = -Xlinker -objc_gc_compaction; |