Title: [168224] tags/Safari-538.33.1/Source/bmalloc
- Revision
- 168224
- Author
- bshaf...@apple.com
- Date
- 2014-05-03 10:40:22 -0700 (Sat, 03 May 2014)
Log Message
Merged r168152.
Modified Paths
Diff
Modified: tags/Safari-538.33.1/Source/bmalloc/ChangeLog (168223 => 168224)
--- tags/Safari-538.33.1/Source/bmalloc/ChangeLog 2014-05-03 17:36:45 UTC (rev 168223)
+++ tags/Safari-538.33.1/Source/bmalloc/ChangeLog 2014-05-03 17:40:22 UTC (rev 168224)
@@ -1,3 +1,14 @@
+2014-05-03 Babak Shafiei <bshaf...@apple.com>
+
+ Merge 168152
+
+ 2014-05-01 Dan Bernstein <m...@apple.com>
+
+ Fixed production builds for the iOS Simulator.
+
+ * Configurations/bmalloc.xcconfig: Include INSTALL_PATH_PREFIX in
+ PRIVATE_HEADERS_FOLDER_PATH when installing.
+
2014-04-20 Geoffrey Garen <gga...@apple.com>
bmalloc: Segregate pages by objects size
Modified: tags/Safari-538.33.1/Source/bmalloc/Configurations/bmalloc.xcconfig (168223 => 168224)
--- tags/Safari-538.33.1/Source/bmalloc/Configurations/bmalloc.xcconfig 2014-05-03 17:36:45 UTC (rev 168223)
+++ tags/Safari-538.33.1/Source/bmalloc/Configurations/bmalloc.xcconfig 2014-05-03 17:40:22 UTC (rev 168224)
@@ -23,7 +23,9 @@
EXECUTABLE_PREFIX = lib;
INSTALL_PATH_ACTUAL = /usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/bmalloc;
+PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
+PRIVATE_HEADERS_FOLDER_PATH_NO = /usr/local/include/bmalloc;
+PRIVATE_HEADERS_FOLDER_PATH_YES = $(INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
PRODUCT_NAME = bmalloc;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
