diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 20:18:35 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 20:18:35 +0000 |
| commit | 44cd68ef3da9c05d7f15dc3205dd8065d7bda86f (patch) | |
| tree | 12f30cade677ee67aad462aaea49f1dd16342aed /third_party | |
| parent | ea07cdef6c69befb4d7fd999ae80542f2a555087 (diff) | |
| download | chromium_src-44cd68ef3da9c05d7f15dc3205dd8065d7bda86f.zip chromium_src-44cd68ef3da9c05d7f15dc3205dd8065d7bda86f.tar.gz chromium_src-44cd68ef3da9c05d7f15dc3205dd8065d7bda86f.tar.bz2 | |
Fix instrumented libcap2 build.
BUG=313751
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/161073002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/instrumented_libraries/download_build_install.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/download_build_install.py index 2352bce..3c74ffd 100755 --- a/third_party/instrumented_libraries/download_build_install.py +++ b/third_party/instrumented_libraries/download_build_install.py @@ -139,14 +139,17 @@ def nss_make_and_copy(parsed_arguments, environment, install_prefix): def libcap2_make_install(parsed_arguments, environment, install_prefix): # libcap2 doesn't come with a configure script - shell_call('make -j%s' % parsed_arguments.jobs, - parsed_arguments.verbose, environment) - install_args = [] - install_args.append('prefix=%s' % install_prefix) - # Do not install in lib64/. - install_args.append('lib=lib') - # Skip a step that requires sudo. - install_args.append('RAISE_SETFCAP=no') + make_args = ['%s="%s"' % (name, environment[name]) for name in ['CC', 'CXX', + 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']] + shell_call('make -j%s %s' % (parsed_arguments.jobs, ' '.join(make_args)), + parsed_arguments.verbose, environment) + install_args = [ + 'prefix=%s' % install_prefix, + # Do not install in lib64/. + 'lib=lib', + # Skip a step that requires sudo. + 'RAISE_SETFCAP=no' + ] shell_call('make -j%s install %s' % (parsed_arguments.jobs, ' '.join(install_args)), parsed_arguments.verbose, environment) |