Diff
Modified: trunk/Source/WTF/ChangeLog (229590 => 229591)
--- trunk/Source/WTF/ChangeLog 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/WTF/ChangeLog 2018-03-13 23:18:41 UTC (rev 229591)
@@ -1,3 +1,16 @@
+2018-03-13 Tim Horton <timothy_hor...@apple.com>
+
+ Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc
+ https://bugs.webkit.org/show_bug.cgi?id=183576
+ <rdar://problem/38396766>
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/CopyWTFHeaders.xcconfig:
+ * Configurations/WTF.xcconfig:
+ * Configurations/mbmalloc.xcconfig:
+
2018-03-13 Michael Catanzaro <mcatanz...@igalia.com>
Unreviewed, fix typo in a comment
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (229590 => 229591)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -90,7 +90,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
+LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
@@ -126,3 +128,12 @@
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WTF_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
Modified: trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig (229590 => 229591)
--- trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/WTF/Configurations/CopyWTFHeaders.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -21,6 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRIVATE_HEADERS_FOLDER_PATH = usr/local/include/wtf;
-ICU_PRIVATE_HEADERS_FOLDER_PATH = usr/local/include;
+PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)usr/local/include/wtf;
+ICU_PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)usr/local/include;
INSTALLHDRS_SCRIPT_PHASE = YES;
Modified: trunk/Source/WTF/Configurations/WTF.xcconfig (229590 => 229591)
--- trunk/Source/WTF/Configurations/WTF.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/WTF/Configurations/WTF.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -22,7 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
+INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
PRODUCT_NAME = WTF;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
Modified: trunk/Source/WTF/Configurations/mbmalloc.xcconfig (229590 => 229591)
--- trunk/Source/WTF/Configurations/mbmalloc.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/WTF/Configurations/mbmalloc.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -22,7 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
+INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
PRODUCT_NAME = mbmalloc;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
Modified: trunk/Source/bmalloc/ChangeLog (229590 => 229591)
--- trunk/Source/bmalloc/ChangeLog 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/bmalloc/ChangeLog 2018-03-13 23:18:41 UTC (rev 229591)
@@ -1,3 +1,15 @@
+2018-03-13 Tim Horton <timothy_hor...@apple.com>
+
+ Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in WTF and bmalloc
+ https://bugs.webkit.org/show_bug.cgi?id=183576
+ <rdar://problem/38396766>
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/bmalloc.xcconfig:
+ * Configurations/mbmalloc.xcconfig:
+
2018-03-10 Filip Pizlo <fpi...@apple.com>
PerProcess<> should be safe by default
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (229590 => 229591)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -122,3 +122,12 @@
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_ALTERNATE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_ALTERNATE_FRAMEWORKS_DIR)));
+
+BMALLOC_INSTALL_PATH_PREFIX = $(BMALLOC_INSTALL_PATH_PREFIX_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+BMALLOC_INSTALL_PATH_PREFIX_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
Modified: trunk/Source/bmalloc/Configurations/bmalloc.xcconfig (229590 => 229591)
--- trunk/Source/bmalloc/Configurations/bmalloc.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/bmalloc/Configurations/bmalloc.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -22,8 +22,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
+INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
+PRIVATE_HEADERS_FOLDER_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
PRODUCT_NAME = bmalloc;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
Modified: trunk/Source/bmalloc/Configurations/mbmalloc.xcconfig (229590 => 229591)
--- trunk/Source/bmalloc/Configurations/mbmalloc.xcconfig 2018-03-13 23:01:46 UTC (rev 229590)
+++ trunk/Source/bmalloc/Configurations/mbmalloc.xcconfig 2018-03-13 23:18:41 UTC (rev 229591)
@@ -22,7 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = /usr/local/lib;
+INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
PRODUCT_NAME = mbmalloc;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
