summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript.javascriptcore_pcre
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 14:56:10 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 14:56:10 +0000
commit9b7ef2fba9efa3d6d653cfc83468632f080b8245 (patch)
tree8aeea436be47f9097af23c32b3de9aaa2e0da827 /webkit/SConscript.javascriptcore_pcre
parent47c0fef5bb322c176f16181ef3d65ed4a8c19ed6 (diff)
downloadchromium_src-9b7ef2fba9efa3d6d653cfc83468632f080b8245.zip
chromium_src-9b7ef2fba9efa3d6d653cfc83468632f080b8245.tar.gz
chromium_src-9b7ef2fba9efa3d6d653cfc83468632f080b8245.tar.bz2
Revert both 3079 and 3063 because they caused linux and mac breakage.
Review URL: http://codereview.chromium.org/7015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3098 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)