diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-10-28 17:41:16 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-10-28 19:05:09 -0700 |
| commit | 340c6cf9bdf6734013f0c6b4e0d8f3a10fbd4ed0 (patch) | |
| tree | e4b264ea6124739f36d850a06cacc5830de713c1 /config.make.in | |
| parent | f301e5334065e93aace667fd4a87bce6fc1dbd13 (diff) | |
| download | glibc-340c6cf9bdf6734013f0c6b4e0d8f3a10fbd4ed0.zip glibc-340c6cf9bdf6734013f0c6b4e0d8f3a10fbd4ed0.tar.gz glibc-340c6cf9bdf6734013f0c6b4e0d8f3a10fbd4ed0.tar.bz2 | |
Use newly built crt*.o files to build shared objects [BZ #22362]hjl/pr22362/master
When multi-lib GCC is used to build glibc, the search order of GCC driver
for crt*.o is -B*/`gcc -print-multi-directory`, the installed diretory,
-B*/. This patch extends multi-lib support from nptl/Makefile to
csu/Makefile so that -B/glibc-build-directory/csu/ will pick up the newly
built crt*.o.
Tested on x86-64 for i686 and x32.
[BZ #22362]
* config.make.in (multidir): New.
* configure.ac (libc_cv_multidir): New. AC_SUBST.
* configure: Regenerated.
* csu/Makefile [$(multidir) != .](multilib-extra-objs): New.
[$(multidir) != .](extra-objs): Add $(multilib-extra-objs).
[$(multidir) != .]($(addprefix $(objpfx)$(multidir)/, $(install-lib))):
New target.
* nptl/Makefile: Don't include multidir.mk.
($(objpfx)multidir.mk): Removed.
Diffstat (limited to 'config.make.in')
| -rw-r--r-- | config.make.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.make.in b/config.make.in index fd2dbc9..bd84a57 100644 --- a/config.make.in +++ b/config.make.in @@ -21,6 +21,7 @@ includedir = @includedir@ datarootdir = @datarootdir@ localstatedir = @libc_cv_localstatedir@ localedir = @localedir@ +multidir= @libc_cv_multidir@ # Should we use and build ldconfig? use-ldconfig = @use_ldconfig@ |