Changeset 161715 in webkit

Timestamp:

Jan 10, 2014 6:26:39 PM (10 years ago)

Author:

aestes@apple.com

Message:

[iOS] Build fix: make sure WTF_PLATFORM_IOS is defined when preprocessing

• DerivedSources.make:
• bindings/scripts/preprocessor.pm:

(applyPreprocessor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• bindings/scripts/preprocessor.pm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Andy Estes  <aestes@apple.com>
+
+        [iOS] Build fix: make sure WTF_PLATFORM_IOS is defined when preprocessing
+
+        * DerivedSources.make:
+        * bindings/scripts/preprocessor.pm:
+        (applyPreprocessor):
+
 2014-01-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -790 +790 @@
 endif
 
-CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $(PLATFORM_FEATURE_DEFINES)
+CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
         cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
         perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
 
-CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl $(PLATFORM_FEATURE_DEFINES)
+CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
         cat $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
         perl -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"

trunk/Source/WebCore/bindings/scripts/preprocessor.pm

@@ -58 +58 @@
     }
 
-    if ($Config::Config{"osname"} eq "darwin" && $ENV{SDKROOT}) {
+    if ($Config::Config{"osname"} eq "darwin") {
         push(@args, "-I" . $ENV{BUILT_PRODUCTS_DIR} . "/usr/local/include") if $ENV{BUILT_PRODUCTS_DIR};
         push(@args, "-isysroot", $ENV{SDKROOT}) if $ENV{SDKROOT};
+        $defines .= " WTF_PLATFORM_IOS" if $ENV{PLATFORM_NAME} =~ /iphone(os|simulator)/;
     }