diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-10 09:35:09 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-10 12:46:12 +0200 |
| commit | 7478addd84ab6808307f4f285ab05f3a76bbb257 (patch) | |
| tree | a02427985f419db2885fb3a43c254876a39a8baf /libphobos/d_rules.am | |
| parent | 6c4a05f251ae8a39fa896524defaf4228328c259 (diff) | |
| download | gcc-7478addd84ab6808307f4f285ab05f3a76bbb257.zip gcc-7478addd84ab6808307f4f285ab05f3a76bbb257.tar.gz gcc-7478addd84ab6808307f4f285ab05f3a76bbb257.tar.bz2 | |
libphobos: Use libdruntime as a convenience library for libphobos.
As a prerequesite for PR94304, it becomes easier to manage selectively
compiling sublibraries when there's only one library to link to.
So a druntime convenience library is built to be part of phobos, however
separate druntime library is still built and installed, to allow linking
only to the core runtime explicitly, rather than pulling in the entire
standard library with it.
The gdc driver no longer generates an '-lgdruntime' option, and the
inclusion of the libdruntime library path has been removed from the
testsuite.
gcc/d/ChangeLog:
* d-spec.cc (LIBDRUNTIME): Remove.
(LIBDRUNTIME_PROFILE): Remove.
(lang_specific_driver): Don't link in libgdruntime.
gcc/testsuite/ChangeLog:
* lib/gdc.exp (gdc_link_flags): Remove libdruntime library path.
libphobos/ChangeLog:
* d_rules.am (libdgruntime_la_LINK): Move to libdruntime/Makefile.am.
(libgphobos_la_LINK): Move to src/Makefile.am
* libdruntime/Makefile.am: Add libgdruntime_convenience library.
* libdruntime/Makefile.in: Regenerate.
* src/Makefile.am (libgphobos_la_LIBADD): Add libgdruntime_convenience
library.
(libgphobos_la_DEPENDENCIES): Likewise.
* src/Makefile.in: Regenerate.
* testsuite/lib/libphobos.exp: Remove libdruntime library paths.
* testsuite/testsuite_flags.in: Likewise.
Diffstat (limited to 'libphobos/d_rules.am')
| -rw-r--r-- | libphobos/d_rules.am | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libphobos/d_rules.am b/libphobos/d_rules.am index 979142b..c05c8e8 100644 --- a/libphobos/d_rules.am +++ b/libphobos/d_rules.am @@ -32,14 +32,3 @@ toolexeclibdir = $(libphobos_toolexeclibdir) LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(GDC) $(AM_DFLAGS) - -# Also override library link commands: This is not strictly -# required, but we want to record additional dependencies such -# as pthread in the library -libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \ - $(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@ - -libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \ - $(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@ |