summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript.javascriptcore_pcre
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 21:47:00 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 21:47:00 +0000
commitb36c32ebb6f327c08b0c7db553e518e0dc1ddeb8 (patch)
tree7c0b2692371a573aeab830937e81bf16433437ea /webkit/SConscript.javascriptcore_pcre
parentaa98118241207837dc8015ffaf2f8dbaf2de0687 (diff)
downloadchromium_src-b36c32ebb6f327c08b0c7db553e518e0dc1ddeb8.zip
chromium_src-b36c32ebb6f327c08b0c7db553e518e0dc1ddeb8.tar.gz
chromium_src-b36c32ebb6f327c08b0c7db553e518e0dc1ddeb8.tar.bz2
Accomodate recent unforks in the Linux (SCons) build.
Review URL: http://codereview.chromium.org/7031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3133 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/SConscript.javascriptcore_pcre')
-rw-r--r--webkit/SConscript.javascriptcore_pcre4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre
index 2bd4aa0..d13267c 100644
--- a/webkit/SConscript.javascriptcore_pcre
+++ b/webkit/SConscript.javascriptcore_pcre
@@ -39,9 +39,7 @@ input_files = [
'$PCRE_DIR/pcre_xclass.cpp',
'$PCRE_DIR/pcre_ucp_searchfuncs.cpp',
'$PCRE_DIR/pcre_tables.cpp',
- # Uncomment and replace following line when the $PENDING_DIR file unforks.
- #'$PCRE_DIR/pcre_exec.cpp',
- '$PENDING_DIR/pcre_exec.cpp',
+ '$PCRE_DIR/pcre_exec.cpp',
]
env.ChromeStaticLibrary('JavaScriptCore_pcre', input_files)