diff options
| author | earthdok <earthdok@chromium.org> | 2014-09-29 10:32:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 17:33:06 +0000 |
| commit | aba96951daceed59306f501d6382b43ba87931c6 (patch) | |
| tree | 1811a8331c5c33d484128c55568ad5d81ad0a5c0 /third_party | |
| parent | 60d2c270d92b1510c8a371d653ad1a6f7f41326b (diff) | |
| download | chromium_src-aba96951daceed59306f501d6382b43ba87931c6.zip chromium_src-aba96951daceed59306f501d6382b43ba87931c6.tar.gz chromium_src-aba96951daceed59306f501d6382b43ba87931c6.tar.bz2 | |
Instrumented libraries: fix NSS build.
Unset LDFLAGS before building. Otherwise we override the default LDFLAGS in the
makefile, breaking the build. We want to append our flags to the default flags
instead.
BUG=418175
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/611083003
Cr-Commit-Position: refs/heads/master@{#297200}
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/instrumented_libraries/download_build_install.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/download_build_install.py index 3a2062d..620d2dcc 100755 --- a/third_party/instrumented_libraries/download_build_install.py +++ b/third_party/instrumented_libraries/download_build_install.py @@ -121,13 +121,16 @@ def nss_make_and_copy(parsed_arguments, environment, install_prefix): make_args.append('CC="%s %s"' % (environment['CC'], environment['CFLAGS'])) make_args.append('CXX="%s %s"' % (environment['CXX'], environment['CXXFLAGS'])) - # We need to override ZDEFS_FLAGS at least to prevent -Wl,-z,defs. - # Might as well use this to pass the linker flags, since ZDEF_FLAGS is always + # We need to override ZDEFS_FLAG at least to prevent -Wl,-z,defs. + # Might as well use this to pass the linker flags, since ZDEF_FLAG is always # added during linking on Linux. make_args.append('ZDEFS_FLAG="-Wl,-z,nodefs %s"' % environment['LDFLAGS']) make_args.append('NSPR_INCLUDE_DIR=/usr/include/nspr') make_args.append('NSPR_LIB_DIR=%s/lib' % install_prefix) make_args.append('NSS_ENABLE_ECC=1') + # Make sure we don't override the default flags. + for variable in ['CFLAGS', 'CXXFLAGS', 'LDFLAGS']: + del environment[variable] with ScopedChangeDirectory('nss') as cd_nss: # -j is not supported shell_call('make %s' % ' '.join(make_args), parsed_arguments.verbose, |