diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2021-09-01 14:11:05 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2021-09-01 14:19:35 +0200 |
| commit | 53cfed5cc920e3aba98958415b42d49e9a80a6e3 (patch) | |
| tree | 7e5ce86c8e52b350ffca31294528f3d222854bf6 /libphobos | |
| parent | bea07159d1d4c9a61c8f7097e9f88c2b206b1b2f (diff) | |
| download | gcc-53cfed5cc920e3aba98958415b42d49e9a80a6e3.zip gcc-53cfed5cc920e3aba98958415b42d49e9a80a6e3.tar.gz gcc-53cfed5cc920e3aba98958415b42d49e9a80a6e3.tar.bz2 | |
libphobos: Don't add zlib when ENABLE_LIBDRUNTIME_ONLY
The D run-time library does not depend on zlib, so only include it in
the library when Phobos is being built as well.
libphobos/ChangeLog:
* src/Makefile.am: Don't add zlib when ENABLE_LIBDRUNTIME_ONLY.
* src/Makefile.in: Regenerate.
Diffstat (limited to 'libphobos')
| -rw-r--r-- | libphobos/src/Makefile.am | 4 | ||||
| -rw-r--r-- | libphobos/src/Makefile.in | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am index f97ddcc..9f62510 100644 --- a/libphobos/src/Makefile.am +++ b/libphobos/src/Makefile.am @@ -45,8 +45,12 @@ libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES) libgphobos_la_LIBTOOLFLAGS = libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \ -version-info $(libtool_VERSION) +if ENABLE_LIBDRUNTIME_ONLY +libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la +else libgphobos_la_LIBADD = \ ../libdruntime/libgdruntime_convenience.la $(LIBZ) +endif libgphobos_la_DEPENDENCIES = \ ../libdruntime/libgdruntime_convenience.la libgphobos.spec diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in index 4f76e10..f8b7648 100644 --- a/libphobos/src/Makefile.in +++ b/libphobos/src/Makefile.in @@ -504,9 +504,10 @@ libgphobos_la_LIBTOOLFLAGS = libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \ -version-info $(libtool_VERSION) -libgphobos_la_LIBADD = \ - ../libdruntime/libgdruntime_convenience.la $(LIBZ) +@ENABLE_LIBDRUNTIME_ONLY_FALSE@libgphobos_la_LIBADD = \ +@ENABLE_LIBDRUNTIME_ONLY_FALSE@ ../libdruntime/libgdruntime_convenience.la $(LIBZ) +@ENABLE_LIBDRUNTIME_ONLY_TRUE@libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la libgphobos_la_DEPENDENCIES = \ ../libdruntime/libgdruntime_convenience.la libgphobos.spec |