diff options
| author | Johannes Pfau <johannespfau@gmail.com> | 2019-04-25 11:22:27 +0000 |
|---|---|---|
| committer | Johannes Pfau <jpfau@gcc.gnu.org> | 2019-04-25 11:22:27 +0000 |
| commit | cecd06a9eabc373253e9e268989796eea088ffa2 (patch) | |
| tree | c20d14412b85a3a4ea1cf9f8933ab93878119d5f /gcc | |
| parent | a9e6359a90a16479a8558f76e6be2a4835ccd8f6 (diff) | |
| download | gcc-cecd06a9eabc373253e9e268989796eea088ffa2.zip gcc-cecd06a9eabc373253e9e268989796eea088ffa2.tar.gz gcc-cecd06a9eabc373253e9e268989796eea088ffa2.tar.bz2 | |
D: Do not add target_libs if phobos is disabled
From-SVN: r270571
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/d/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/d/config-lang.in | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/gcc/d/ChangeLog b/gcc/d/ChangeLog index a0a3266..d5b5367 100644 --- a/gcc/d/ChangeLog +++ b/gcc/d/ChangeLog @@ -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> diff --git a/gcc/d/config-lang.in b/gcc/d/config-lang.in index 3fe1ac4..a3f78c7 100644 --- a/gcc/d/config-lang.in +++ b/gcc/d/config-lang.in @@ -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" |