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 c7ac9caaae
)
This commit is contained in:
parent
5e1548a6d9
commit
c1803823c6
|
@ -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>
|
2019-07-01 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
[BZ #24259]
|
[BZ #24259]
|
||||||
|
|
|
@ -172,7 +172,8 @@ CFLAGS-support_paths.c = \
|
||||||
-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
|
-DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \
|
||||||
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
|
-DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \
|
||||||
-DINSTDIR_PATH=\"$(prefix)\" \
|
-DINSTDIR_PATH=\"$(prefix)\" \
|
||||||
-DLIBDIR_PATH=\"$(libdir)\"
|
-DLIBDIR_PATH=\"$(libdir)\" \
|
||||||
|
-DBINDIR_PATH=\"$(bindir)\"
|
||||||
|
|
||||||
ifeq (,$(CXX))
|
ifeq (,$(CXX))
|
||||||
LINKS_DSO_PROGRAM = links-dso-program-c
|
LINKS_DSO_PROGRAM = links-dso-program-c
|
||||||
|
|
|
@ -104,6 +104,8 @@ extern const char support_objdir_elf_ldso[];
|
||||||
extern const char support_install_prefix[];
|
extern const char support_install_prefix[];
|
||||||
/* Corresponds to the install's lib/ or lib64/ directory. */
|
/* Corresponds to the install's lib/ or lib64/ directory. */
|
||||||
extern const char support_libdir_prefix[];
|
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 *,
|
extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *,
|
||||||
size_t, unsigned int);
|
size_t, unsigned int);
|
||||||
|
|
|
@ -57,3 +57,10 @@ const char support_libdir_prefix[] = LIBDIR_PATH;
|
||||||
#else
|
#else
|
||||||
# error please -DLIBDIR_PATH=something in the Makefile
|
# error please -DLIBDIR_PATH=something in the Makefile
|
||||||
#endif
|
#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
|
||||||
|
|
Loading…
Reference in New Issue