diff options
| author | brettw <brettw@chromium.org> | 2015-12-11 19:27:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-12 03:28:47 +0000 |
| commit | 3de132ceb95eb0d1fd40b611374d6868c717d2b4 (patch) | |
| tree | 5fe875a86df5819a69c400aced7f076f91d22038 /base | |
| parent | 74c19cc8293e9f66e5c6c66be373cc23c53eda64 (diff) | |
| download | chromium_src-3de132ceb95eb0d1fd40b611374d6868c717d2b4.zip chromium_src-3de132ceb95eb0d1fd40b611374d6868c717d2b4.tar.gz chromium_src-3de132ceb95eb0d1fd40b611374d6868c717d2b4.tar.bz2 | |
Only set -rpath=$ORIGIN in component builds by default.
Statically-linked binaries do not need -rpath=$ORIGIN
set, and setting it can be a source of strange security
issues (see bug for more details).
Manually add this to some test binaries that require shared libraries to be loaded from the build directory.
R=phajdan.jr@chromium.org, thestig@chromium.org
BUG=556843
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_chromium_dbg_ng
Forked from http://crrev.com/1448213002
Review URL: https://codereview.chromium.org/1514203002
Cr-Commit-Position: refs/heads/master@{#364877}
Diffstat (limited to 'base')
| -rw-r--r-- | base/BUILD.gn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index c19b80d..6eaddd2 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -1564,11 +1564,17 @@ test("base_unittests") { if (is_linux) { sources -= [ "file_version_info_unittest.cc" ] sources += [ "nix/xdg_util_unittest.cc" ] + deps += [ "//base/test:malloc_wrapper" ] if (use_glib) { configs += [ "//build/config/linux:glib" ] } + + if (!is_component_build) { + # Set rpath to find libmalloc_wrapper.so even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } } if (!is_linux || use_ozone) { |