]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libphobos: Don't add zlib when ENABLE_LIBDRUNTIME_ONLY
authorIain Buclaw <ibuclaw@gdcproject.org>
Wed, 1 Sep 2021 12:11:05 +0000 (14:11 +0200)
committerIain Buclaw <ibuclaw@gdcproject.org>
Wed, 1 Sep 2021 12:19:35 +0000 (14:19 +0200)
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.

libphobos/src/Makefile.am
libphobos/src/Makefile.in

index f97ddccaca84e4998b9dd7314ae2221bf9883162..9f6251009f69a7d5eeb4f0aef2a7bb0fb55b5cbf 100644 (file)
@@ -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
 
index 4f76e1077d5e0f2fc2d514d5e4b449e1e2cc321d..f8b76486e6e7786254e74405ab1751256acdd278 100644 (file)
@@ -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