summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-20 22:03:45 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-20 22:03:45 +0000
commit45015aed8e950882146f4cd7ac51422548625aa0 (patch)
tree7417c6b39e20fe239915ecb95a52af4dfd84606c /webkit
parentc3ec35638ea6594b6bdbac7ff92c38add8984623 (diff)
downloadchromium_src-45015aed8e950882146f4cd7ac51422548625aa0.zip
chromium_src-45015aed8e950882146f4cd7ac51422548625aa0.tar.gz
chromium_src-45015aed8e950882146f4cd7ac51422548625aa0.tar.bz2
Fix the lack of executable bits on code we can't modify in the
repository. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/SConscript4
-rw-r--r--webkit/SConscript.javascriptcore_pcre1
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/SConscript b/webkit/SConscript
index 97074a2..a461d9f 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -40,6 +40,10 @@ port_dir = env.Dir('#/$BUILD_TYPE/webkit/port')
port_dir.addRepository(env.Dir('#/../webkit/port'))
port_dir.addRepository(env.Dir('#/../third_party/WebKit/WebCore'))
+# Point to perl. We do this so we don't have to set the +x bit on scripts
+# because we can't currently modify the third_party/WebKit repository.
+if env['PLATFORM'] == 'posix':
+ env.Append(PERL = '/usr/bin/perl')
env.Prepend(
CPPPATH = [
diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre
index 0ee9784..c1adcd0 100644
--- a/webkit/SConscript.javascriptcore_pcre
+++ b/webkit/SConscript.javascriptcore_pcre
@@ -37,6 +37,7 @@ env.Prepend(
CPPPATH = [
'$WEBKIT_DIR/port/JavaScriptCore',
'$WEBKIT_DIR/port/JavaScriptCore/pcre',
+ '$WEBKIT_DIR/build/JSConfig/WebCore/v8',
])
if env['PLATFORM'] == 'win32':