aboutsummaryrefslogtreecommitdiff
path: root/Makefile.def
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2015-08-06 18:35:26 -0400
committerDJ Delorie <dj@redhat.com>2015-08-06 23:55:06 -0400
commit016a3251631341bf4d8fe50966d2b70f8ea69e96 (patch)
tree1ff0c40495ed3f51ac0ee574b3c48b87deb7e5e9 /Makefile.def
parent308d9764e1ce02c31882e6d99bbaebe63c7fe830 (diff)
downloadgdb-016a3251631341bf4d8fe50966d2b70f8ea69e96.zip
gdb-016a3251631341bf4d8fe50966d2b70f8ea69e96.tar.gz
gdb-016a3251631341bf4d8fe50966d2b70f8ea69e96.tar.bz2
Yaakov Selkowitz: fixes for in-tree libiconv
* Makefile.def (libiconv): Define bootstrap=true. Mark pdf/html/info as missing. (configure-gcc): Depend on all-libiconv. (all-gcc): Ditto. (configure-libcpp): Ditto. (all-libcpp): Ditto. (configure-intl): Ditto. (all-intl): Ditto. * Makefile.in: Regenerate. binutils/ * configure: Regenerate. gdb/ * Makefile.in (LIBICONV): Define. (CLIBS): Add LIBICONV. * acinclude.m4: Use config/iconv.m4 instead of custom AM_ICONV. * configure: Regenerate.
Diffstat (limited to 'Makefile.def')
-rw-r--r--Makefile.def11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.def b/Makefile.def
index 4394188..01445e4 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -93,9 +93,12 @@ host_modules= { module= libiberty-linker-plugin; bootstrap=true;
extra_make_flags='@extra_linker_plugin_flags@'; };
// We abuse missing to avoid installing anything for libiconv.
host_modules= { module= libiconv;
+ bootstrap=true;
extra_configure_flags='--disable-shared';
no_install= true;
- missing= install-info;
+ missing= pdf;
+ missing= html;
+ missing= info;
missing= install-pdf;
missing= install-html;
missing= install-info; };
@@ -324,6 +327,7 @@ dependencies = { module=configure-gcc; on=all-gas; };
dependencies = { module=configure-gcc; on=all-ld; };
dependencies = { module=configure-gcc; on=all-gold; };
dependencies = { module=configure-gcc; on=all-libelf; };
+dependencies = { module=configure-gcc; on=all-libiconv; };
dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
dependencies = { module=all-gcc; on=all-intl; };
dependencies = { module=all-gcc; on=all-mpfr; };
@@ -342,6 +346,7 @@ dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; };
dependencies = { module=all-gcc; on=all-libiberty; };
dependencies = { module=all-gcc; on=all-fixincludes; };
dependencies = { module=all-gcc; on=all-lto-plugin; };
+dependencies = { module=all-gcc; on=all-libiconv; };
dependencies = { module=info-gcc; on=all-build-libiberty; };
dependencies = { module=dvi-gcc; on=all-build-libiberty; };
dependencies = { module=pdf-gcc; on=all-build-libiberty; };
@@ -353,8 +358,10 @@ dependencies = { module=install-strip-gcc ; on=install-strip-lto-plugin; };
dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
dependencies = { module=configure-libcpp; on=configure-intl; };
+dependencies = { module=configure-libcpp; on=all-libiconv; };
dependencies = { module=all-libcpp; on=all-libiberty; hard=true; };
dependencies = { module=all-libcpp; on=all-intl; };
+dependencies = { module=all-libcpp; on=all-libiconv; };
dependencies = { module=all-fixincludes; on=all-libiberty; };
@@ -373,9 +380,11 @@ dependencies = { module=all-gotools; on=all-target-libgo; };
dependencies = { module=all-utils; on=all-libiberty; };
+dependencies = { module=configure-intl; on=all-libiconv; };
dependencies = { module=configure-mpfr; on=all-gmp; };
dependencies = { module=configure-mpc; on=all-mpfr; };
dependencies = { module=configure-isl; on=all-gmp; };
+dependencies = { module=all-intl; on=all-libiconv; };
// Host modules specific to gdb.
dependencies = { module=configure-gdb; on=all-intl; };