diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 00:05:39 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-15 00:05:39 +0000 |
| commit | 24cfabd394f6e1164e65416b1ee3802dc8f19b57 (patch) | |
| tree | 6f80984c303a8dfdfb4e7a8e38780e79fb0d3962 /build | |
| parent | 2f3f51e250fc3b9580118c64ce01052eb25e6b5a (diff) | |
| download | chromium_src-24cfabd394f6e1164e65416b1ee3802dc8f19b57.zip chromium_src-24cfabd394f6e1164e65416b1ee3802dc8f19b57.tar.gz chromium_src-24cfabd394f6e1164e65416b1ee3802dc8f19b57.tar.bz2 | |
Get googleurl and net to build on linux so we can parallelize even more. This builds an empty net_unittests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.googleurl | 12 | ||||
| -rw-r--r-- | build/SConscript.main | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/build/SConscript.googleurl b/build/SConscript.googleurl index 9998c885..d2ed563 100644 --- a/build/SConscript.googleurl +++ b/build/SConscript.googleurl @@ -43,12 +43,15 @@ env.Append( CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', ], - - CCFLAGS = [ - '/TP', - ], ) +if env['PLATFORM'] == 'win32': + env.Append( + CCFLAGS = [ + '/TP', + ], + ) + input_files = [ 'src/gurl.cc', 'src/url_canon_etc.cc', @@ -90,4 +93,3 @@ env.ChromeStaticLibrary('googleurl', input_files) #] # #env_tests.ChromeStaticLibrary('googleurl_tests', test_files) - diff --git a/build/SConscript.main b/build/SConscript.main index d687f67..3f7623f 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -321,7 +321,15 @@ elif env['PLATFORM'] == 'posix': SetOption('num_jobs', cpus + 1) # For now, linux only loads the components we know work on Linux, by default. - load = ['base', 'testing', 'third_party', 'breakpad', 'skia'] + load = [ + 'base', + 'breakpad', + 'googleurl', + 'net', + 'skia', + 'testing', + 'third_party', + ] env.Replace( # TODO(linux): we should also compile with -Werror, but not yet. |