diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-05-13 13:57:37 -0300 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2019-10-31 18:10:53 -0400 |
| commit | c1803823c697b4b586208f703ae1ca6a9986b52a (patch) | |
| tree | 651a47403ed4e3c15b71f76c4cd3295dee54db2f | |
| parent | 5e1548a6d9c5c544f13cb71f4462b3f38e87a3c6 (diff) | |
| download | glibc-c1803823c697b4b586208f703ae1ca6a9986b52a.tar.gz | |
support: Export bindir path on support_path
Checked on x86_64-linux-gnu.
* support/Makefile (CFLAGS-support_paths.c): Add -DBINDIR_PATH.
* support/support.h (support_bindir_prefix): New variable.
* support/support_paths.c [BINDIR_PATH] (support_bindir_prefix):
Reviewed-by: DJ Delorie <dj@redhat.com>
(cherry picked from commit c7ac9caaae6f8d02d4e0c7618d4991324a084c66)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | support/Makefile | 3 | ||||
| -rw-r--r-- | support/support.h | 2 | ||||
| -rw-r--r-- | support/support_paths.c | 7 |
4 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2019-05-14 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * support/Makefile (CFLAGS-support_paths.c): Add -DBINDIR_PATH. + * support/support.h (support_bindir_prefix): New variable. + * support/support_paths.c [BINDIR_PATH] (support_bindir_prefix): + + * config.make.in (bindir): New variable. + 2019-07-01 H.J. Lu <hongjiu.lu@intel.com> [BZ #24259] diff --git a/support/Makefile b/support/Makefile index 8d61de6c57..5542de3fa1 100644 --- a/support/Makefile +++ b/support/Makefile @@ -172,7 +172,8 @@ CFLAGS-support_paths.c = \ -DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \ -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \ -DINSTDIR_PATH=\"$(prefix)\" \ - -DLIBDIR_PATH=\"$(libdir)\" + -DLIBDIR_PATH=\"$(libdir)\" \ + -DBINDIR_PATH=\"$(bindir)\" ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c diff --git a/support/support.h b/support/support.h index 119495e5a9..1a45ecbb14 100644 --- a/support/support.h +++ b/support/support.h @@ -104,6 +104,8 @@ extern const char support_objdir_elf_ldso[]; extern const char support_install_prefix[]; /* Corresponds to the install's lib/ or lib64/ directory. */ extern const char support_libdir_prefix[]; +/* Corresponds to the install's bin/ directory. */ +extern const char support_bindir_prefix[]; extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *, size_t, unsigned int); diff --git a/support/support_paths.c b/support/support_paths.c index 937e6e1012..75634aab9a 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -57,3 +57,10 @@ const char support_libdir_prefix[] = LIBDIR_PATH; #else # error please -DLIBDIR_PATH=something in the Makefile #endif + +#ifdef BINDIR_PATH +/* Corresponds to the install's bin/ directory. */ +const char support_bindir_prefix[] = BINDIR_PATH; +#else +# error please -DBINDIR_PATH=something in the Makefile +#endif |