Title: [161692] trunk/Source/WebCore
- Revision
- 161692
- Author
- aes...@apple.com
- Date
- 2014-01-10 16:16:25 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Build Fix: Properly add $SDKROOT/usr/local/include/ to the search path when building PublicDOMInterfaces.h
* bindings/scripts/CodeGeneratorObjC.pm:
(ReadPublicInterfaces):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161691 => 161692)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 23:55:09 UTC (rev 161691)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 00:16:25 UTC (rev 161692)
@@ -1,3 +1,10 @@
+2014-01-10 Andy Estes <aes...@apple.com>
+
+ [iOS] Build Fix: Properly add $SDKROOT/usr/local/include/ to the search path when building PublicDOMInterfaces.h
+
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (ReadPublicInterfaces):
+
2014-01-10 Joseph Pecoraro <pecor...@apple.com>
Web Inspector: Remove unimplemented or static ScriptDebugServer features
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (161691 => 161692)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2014-01-10 23:55:09 UTC (rev 161691)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2014-01-11 00:16:25 UTC (rev 161692)
@@ -251,17 +251,10 @@
%publicInterfaces = ();
my @args = qw(-E -P -x objective-c);
- # Set include path to find <wtf/Platform.h>. We search BUILT_PRODUCTS_DIR
- # first for local developer builds, then the installation path for B&I
- # builds.
+
push(@args, "-I" . $ENV{BUILT_PRODUCTS_DIR} . "/usr/local/include") if $ENV{BUILT_PRODUCTS_DIR};
- push(@args, "-I" . $ENV{BUILT_PRODUCTS_DIR} . $ENV{SDKROOT} . "/usr/local/include") if $ENV{BUILT_PRODUCTS_DIR};
+ push(@args, "-isysroot", $ENV{SDKROOT}) if $ENV{SDKROOT};
- # Xcode 3.1 is required for SDKROOT to be set.
- if ($ENV{SDKROOT} && $ENV{SYSTEM_LIBRARY_DIR}) {
- push(@args, "-I" . $ENV{BUILT_PRODUCTS_DIR} . $ENV{SDKROOT} . "/usr/local/include") if $ENV{BUILT_PRODUCTS_DIR};
- push(@args, "-I" . $ENV{SDKROOT} . "/usr/local/include");
- }
my $fileName = "WebCore/bindings/objc/PublicDOMInterfaces.h";
my $gccLocation = "";
if ($ENV{CC}) {
@@ -274,11 +267,6 @@
$gccLocation = "/usr/bin/gcc";
}
- if ($ENV{SDKROOT}) {
- # PLATFORM(IOS)
- push(@args, "-isysroot", $ENV{SDKROOT});
- }
-
open FILE, "-|", $gccLocation, @args,
(map { "-D$_" } split(/ +/, $defines)), "-DOBJC_CODE_GENERATION", $fileName or die "Could not open $fileName";
my @documentContent = <FILE>;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
