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

Side by Side Diff: third_party/libxml/libxml.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/libxml/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 11 matching lines...) Expand all
22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
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 if env.WantSystemLib('libxml'):
33 Return()
34
32 env = env.Clone() 35 env = env.Clone()
33 36
34 env.Prepend( 37 env.Prepend(
35 CPPPATH = [ 38 CPPPATH = [
36 '$ICU38_DIR/public/common', 39 '$ICU38_DIR/public/common',
37 '$ICU38_DIR/public/18n', 40 '$ICU38_DIR/public/18n',
38 '$ZLIB_DIR', 41 '$ZLIB_DIR',
39 'DerivedSources', 42 'DerivedSources',
40 'DerivedSources/include', 43 'DerivedSources/include',
41 'include', 44 'include',
42 ], 45 ],
43 )
44
45 env.Append(
46 CPPDEFINES = [ 46 CPPDEFINES = [
47 'U_STATIC_IMPLEMENTATION', 47 'U_STATIC_IMPLEMENTATION',
48 'LIBXML_STATIC', 48 'LIBXML_STATIC',
49 ], 49 ],
50 ) 50 )
51 51
52 if env['PLATFORM'] == 'win32': 52 if env['PLATFORM'] == 'win32':
53 env.Append( 53 env.Append(
54 CCFLAGS = [ 54 CCFLAGS = [
55 '/TC', 55 '/TC',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes') 148 CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes')
149 elif env['PLATFORM'] == 'posix': 149 elif env['PLATFORM'] == 'posix':
150 config_files = [ 150 config_files = [
151 'config.h', 151 'config.h',
152 'include/libxml/xmlversion.h', 152 'include/libxml/xmlversion.h',
153 'xml2-config', 153 'xml2-config',
154 ] 154 ]
155 for cf in config_files: 155 for cf in config_files:
156 result = env.Command('DerivedSources/' + cf, 'linux/' + cf, 156 result = env.Command('DerivedSources/' + cf, 'linux/' + cf,
157 Copy('$TARGET', '$SOURCE')) 157 Copy('$TARGET', '$SOURCE'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698