diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 19:19:21 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 19:19:21 +0000 |
| commit | da27100a6ff33610a8cbcc7f8ea142c0446d1266 (patch) | |
| tree | 6c4b43004a3759f0ec37a0385399857a1c801cc2 /build | |
| parent | a0d6a578eb6d44a6359a394cfdc7c78ff8802832 (diff) | |
| download | chromium_src-da27100a6ff33610a8cbcc7f8ea142c0446d1266.zip chromium_src-da27100a6ff33610a8cbcc7f8ea142c0446d1266.tar.gz chromium_src-da27100a6ff33610a8cbcc7f8ea142c0446d1266.tar.bz2 | |
Build against the system-provided NSS for SSL support.
BUG=1343206
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 18183b7..de3fa16 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -347,10 +347,10 @@ elif env['PLATFORM'] == 'posix': '-Wno-multichar', ] env.Replace( - CCFLAGS = ['-m32', '-g', '-Wall', '-Werror'] + excluded_warnings, - LINKFLAGS = ['-m32'], - # We need pthread for threading, and rt for clock_gettime. - LIBS = ['pthread', 'rt'], + CCFLAGS = ['-m32', '-g', '-pthread', '-Wall', '-Werror'] + excluded_warnings, + LINKFLAGS = ['-m32', '-pthread'], + # We need rt for clock_gettime. + LIBS = ['rt'], PERL = '/usr/bin/perl', PERL_INCLUDE_FLAG = '-I ', @@ -365,6 +365,8 @@ elif env['PLATFORM'] == 'posix': env.Append(CCFLAGS=['-fprofile-arcs', '-ftest-coverage']) env.Append(LINKFLAGS=['-fprofile-arcs']) + # Build with system-provided NSS + env.ParseConfig('pkg-config --cflags --libs nss') else: print "Unsupported SCons $PLATFORM value %s" % repr(env['PLATFORM']) |