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.
This commit is contained in:
parent
bea07159d1
commit
53cfed5cc9
|
@ -45,8 +45,12 @@ libgphobos_la_SOURCES = $(ALL_PHOBOS_SOURCES)
|
||||||
libgphobos_la_LIBTOOLFLAGS =
|
libgphobos_la_LIBTOOLFLAGS =
|
||||||
libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
|
libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
|
||||||
-version-info $(libtool_VERSION)
|
-version-info $(libtool_VERSION)
|
||||||
|
if ENABLE_LIBDRUNTIME_ONLY
|
||||||
|
libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la
|
||||||
|
else
|
||||||
libgphobos_la_LIBADD = \
|
libgphobos_la_LIBADD = \
|
||||||
../libdruntime/libgdruntime_convenience.la $(LIBZ)
|
../libdruntime/libgdruntime_convenience.la $(LIBZ)
|
||||||
|
endif
|
||||||
libgphobos_la_DEPENDENCIES = \
|
libgphobos_la_DEPENDENCIES = \
|
||||||
../libdruntime/libgdruntime_convenience.la libgphobos.spec
|
../libdruntime/libgdruntime_convenience.la libgphobos.spec
|
||||||
|
|
||||||
|
|
|
@ -504,9 +504,10 @@ libgphobos_la_LIBTOOLFLAGS =
|
||||||
libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
|
libgphobos_la_LDFLAGS = -Wc,-nophoboslib,-dstartfiles,-B../libdruntime/gcc \
|
||||||
-version-info $(libtool_VERSION)
|
-version-info $(libtool_VERSION)
|
||||||
|
|
||||||
libgphobos_la_LIBADD = \
|
@ENABLE_LIBDRUNTIME_ONLY_FALSE@libgphobos_la_LIBADD = \
|
||||||
../libdruntime/libgdruntime_convenience.la $(LIBZ)
|
@ENABLE_LIBDRUNTIME_ONLY_FALSE@ ../libdruntime/libgdruntime_convenience.la $(LIBZ)
|
||||||
|
|
||||||
|
@ENABLE_LIBDRUNTIME_ONLY_TRUE@libgphobos_la_LIBADD = ../libdruntime/libgdruntime_convenience.la
|
||||||
libgphobos_la_DEPENDENCIES = \
|
libgphobos_la_DEPENDENCIES = \
|
||||||
../libdruntime/libgdruntime_convenience.la libgphobos.spec
|
../libdruntime/libgdruntime_convenience.la libgphobos.spec
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue