Title: [110042] trunk/Source/WebCore
- Revision
- 110042
- Author
- mr...@apple.com
- Date
- 2012-03-07 02:47:22 -0800 (Wed, 07 Mar 2012)
Log Message
Fix DerivedSources.make to not assume that WTF and WebCore build in to the same build directory.
We can't assume that wtf/Platform.h can be found inside BUILT_PRODUCTS_DIR as
that won't be the case if WTF and WebCore are building in to different build
directories. We should instead look for wtf/Platform.h in the header search path.
Unreviewed due to being a build fix.
* DerivedSources.make: Set up the header search path, and invoke the compiler in
such a manner that it looks for wtf/Platform.h in that search path.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (110041 => 110042)
--- trunk/Source/WebCore/ChangeLog 2012-03-07 10:39:56 UTC (rev 110041)
+++ trunk/Source/WebCore/ChangeLog 2012-03-07 10:47:22 UTC (rev 110042)
@@ -1,3 +1,16 @@
+2012-03-07 Mark Rowe <mr...@apple.com>
+
+ Fix DerivedSources.make to not assume that WTF and WebCore build in to the same build directory.
+
+ We can't assume that wtf/Platform.h can be found inside BUILT_PRODUCTS_DIR as
+ that won't be the case if WTF and WebCore are building in to different build
+ directories. We should instead look for wtf/Platform.h in the header search path.
+
+ Unreviewed due to being a build fix.
+
+ * DerivedSources.make: Set up the header search path, and invoke the compiler in
+ such a manner that it looks for wtf/Platform.h in that search path.
+
2012-03-07 Robin Cao <robin....@torchmobile.com.cn>
[BlackBerry] Upstream Texture and TextureCache
Modified: trunk/Source/WebCore/DerivedSources.make (110041 => 110042)
--- trunk/Source/WebCore/DerivedSources.make 2012-03-07 10:39:56 UTC (rev 110041)
+++ trunk/Source/WebCore/DerivedSources.make 2012-03-07 10:47:22 UTC (rev 110042)
@@ -638,16 +638,15 @@
ifeq ($(OS),MACOS)
FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
+HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
-WTF_HEADERS_INCLUDE_PATH="$(BUILT_PRODUCTS_DIR)/usr/local/include"
-
-ifeq ($(shell $(CC) -E -P -dM $(FRAMEWORK_FLAGS) -I$(WTF_HEADERS_INCLUDE_PATH) $(WTF_HEADERS_INCLUDE_PATH)/wtf/Platform.h | grep ENABLE_DASHBOARD_SUPPORT | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -x c++ -E -P -dM $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_DASHBOARD_SUPPORT | cut -d' ' -f3), 1)
ENABLE_DASHBOARD_SUPPORT = 1
else
ENABLE_DASHBOARD_SUPPORT = 0
endif
-ifeq ($(shell $(CC) -E -P -dM $(FRAMEWORK_FLAGS) -I$(WTF_HEADERS_INCLUDE_PATH) $(WTF_HEADERS_INCLUDE_PATH)/wtf/Platform.h | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
+ifeq ($(shell $(CC) -x c++ -E -P -dM $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
ENABLE_ORIENTATION_EVENTS = 1
else
ENABLE_ORIENTATION_EVENTS = 0
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
