Reviewed by Mark Rowe.
Fixes http://bugs.webkit.org/show_bug.cgi?id=15614
Bug 15614: [GTK] qmake based backends don't build on OS X
* Scripts/build-webkit: set QMAKESPEC correctly if building the QT or
GTK backend on a Mac
* Scripts/webkitdirs.pm: extracted the darwin-test from isOSX() into
isDarwin() to make it reusable in other places (like the workaround-
for-prebuilt-qmake in build-webkit)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27015
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2007-10-24 Sven Herzberg <sven@imendio.com>
+
+ Reviewed by Mark Rowe.
+
+ Fixes http://bugs.webkit.org/show_bug.cgi?id=15614
+ Bug 15614: [GTK] qmake based backends don't build on OS X
+
+ * Scripts/build-webkit: set QMAKESPEC correctly if building the QT or
+ GTK backend on a Mac
+ * Scripts/webkitdirs.pm: extracted the darwin-test from isOSX() into
+ isDarwin() to make it reusable in other places (like the workaround-
+ for-prebuilt-qmake in build-webkit)
+
2007-10-24 David Kilzer <ddkilzer@webkit.org>
Refurbish update-webkit script.
}
}
+if ((isGtk() || isQt()) && isDarwin() && !$ENV{QMAKESPEC}) {
+ # The qmake from Trolltech's binary "QT for Mac" distribution tries to
+ # create xcode projects, not Makefiles
+ $ENV{QMAKESPEC} = "macx-g++";
+}
+
if (isCygwin()) {
# Copy WebKitSupportLibrary to the correct location in WebKitLibraries so it can be found.
# Will fail if WebKitSupportLibrary.zip is not in source root.
return ($^O eq "cygwin");
}
+sub isDarwin()
+{
+ return ($^O eq "darwin");
+}
+
sub isOSX()
{
- return ($^O eq "darwin") unless (isQt() or isGtk());
+ return isDarwin() unless (isQt() or isGtk());
return 0;
}