Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: third_party/libxslt/libxslt.scons

Issue 11430: Fix use of LOAD= with WantSystemLib()... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/third_party/libxslt/SConscript:r69-2775
OLDNEW
1 # Copyright 2008, Google Inc. 1 # Copyright 2008, Google Inc.
2 # All rights reserved. 2 # All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 13 matching lines...) Expand all
24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 29
30 Import('env') 30 Import('env')
31 31
32 env = env.Clone() 32 env = env.Clone()
33 33
34 if env.WantSystemLib('libxslt'):
35 Return()
36
34 env.Prepend( 37 env.Prepend(
35 CPPPATH = [ 38 CPPPATH = [
36 '$LIBXML_DIR/DerivedSources/include', 39 '$LIBXML_DIR/DerivedSources/include',
37 '$LIBXML_DIR/include', 40 '$LIBXML_DIR/include',
38 '$ICU38_DIR/public/common', 41 '$ICU38_DIR/public/common',
39 '$ICU38_DIR/public/18n', 42 '$ICU38_DIR/public/18n',
40 '$ZLIB_DIR', 43 '$ZLIB_DIR',
41 'scons', 44 'scons',
42 '.', 45 '.',
43 '../', 46 '../',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 'config.h', 125 'config.h',
123 'xslt-config', 126 'xslt-config',
124 'libexslt/exsltconfig.h', 127 'libexslt/exsltconfig.h',
125 'libxslt/xsltconfig.h', 128 'libxslt/xsltconfig.h',
126 'libxslt/xsltwin32config.h', 129 'libxslt/xsltwin32config.h',
127 ] 130 ]
128 for cf in config_files: 131 for cf in config_files:
129 result = env.Command('scons/' + cf, 'linux/' + cf, 132 result = env.Command('scons/' + cf, 'linux/' + cf,
130 Copy('$TARGET', '$SOURCE')) 133 Copy('$TARGET', '$SOURCE'))
131 134
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698