procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

D: Do not add target_libs if phobos is disabled

Browse source 
From-SVN: r270571
This commit is contained in:
Johannes Pfau 2019-04-25 11:22:27 +00:00 • committed by Johannes Pfau
parent a9e6359a90
commit cecd06a9ea
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/d/ChangeLog
View file

@ -1,3 +1,7 @@
2019-04-25 Johannes Pfau <johannespfau@gmail.com>
* config-lang.in: Do not add target_libs if phobos is disabled.
2019-04-23 Iain Buclaw <ibuclaw@gdcproject.org>
Robin Dapp <rdapp@linux.ibm.com>

20
gcc/d/config-lang.in
View file

@ -25,7 +25,25 @@ language="d"
compilers="d21\$(exeext)"
target_libs="target-libphobos target-zlib target-libbacktrace"
phobos_target_deps="target-zlib target-libbacktrace"
phobos_target_libs="target-libphobos $phobos_target_deps"
case "${noconfigdirs}" in
# Check if phobos was disabled as unsupported
*target-libphobos*)
disabled_target_libs="$disabled_target_libs $phobos_target_deps"
;;
*)
# The --disable-<component> handler in configure.ac is called after
# config-lang.in. So when using --disable-libphobos, it has not been
# added to noconfigdirs here yet
if test x${enable_libphobos} != xno; then
target_libs="$phobos_target_libs"
else
disabled_target_libs="$disabled_target_libs $phobos_target_libs"
fi
;;
esac
gtfiles="\$(srcdir)/d/d-tree.h \$(srcdir)/d/d-builtins.cc \$(srcdir)/d/d-lang.cc \$(srcdir)/d/modules.cc \$(srcdir)/d/typeinfo.cc"