don't look in libiberty/testsuite for anything, it's going away.diff -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libiberty/Makefile.in
(mrg)
--- src/external/gpl3/gcc/dist/libiberty/Makefile.in 2011/06/21 01:23:30 1.1.1.1
+++ src/external/gpl3/gcc/dist/libiberty/Makefile.in 2014/02/23 01:59:40 1.2
@@ -88,26 +88,28 @@ FLAGS_TO_PASS = \ | @@ -88,26 +88,28 @@ FLAGS_TO_PASS = \ | |||
88 | "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ | 88 | "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ | |
89 | "LDFLAGS=$(LDFLAGS)" \ | 89 | "LDFLAGS=$(LDFLAGS)" \ | |
90 | "LOADLIBES=$(LOADLIBES)" \ | 90 | "LOADLIBES=$(LOADLIBES)" \ | |
91 | "RANLIB=$(RANLIB)" \ | 91 | "RANLIB=$(RANLIB)" \ | |
92 | "SHELL=$(SHELL)" \ | 92 | "SHELL=$(SHELL)" \ | |
93 | "prefix=$(prefix)" \ | 93 | "prefix=$(prefix)" \ | |
94 | "exec_prefix=$(exec_prefix)" \ | 94 | "exec_prefix=$(exec_prefix)" \ | |
95 | "libdir=$(libdir)" \ | 95 | "libdir=$(libdir)" \ | |
96 | "libsubdir=$(libsubdir)" \ | 96 | "libsubdir=$(libsubdir)" \ | |
97 | "tooldir=$(tooldir)" | 97 | "tooldir=$(tooldir)" | |
98 | 98 | |||
99 | # Subdirectories to recurse into. We need to override this during cleaning | 99 | # Subdirectories to recurse into. We need to override this during cleaning | |
100 | SUBDIRS = testsuite | 100 | SUBDIRS = testsuite | |
101 | # NetBSD override -- we delete the testsuite | |||
102 | SUBDIRS = | |||
101 | 103 | |||
102 | # FIXME: add @BUILD_INFO@ once we're sure it works for everyone. | 104 | # FIXME: add @BUILD_INFO@ once we're sure it works for everyone. | |
103 | all: stamp-picdir $(TARGETLIB) required-list all-subdir | 105 | all: stamp-picdir $(TARGETLIB) required-list all-subdir | |
104 | @: $(MAKE) ; $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all | 106 | @: $(MAKE) ; $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all | |
105 | 107 | |||
106 | .PHONY: check installcheck | 108 | .PHONY: check installcheck | |
107 | check: check-subdir | 109 | check: check-subdir | |
108 | installcheck: installcheck-subdir | 110 | installcheck: installcheck-subdir | |
109 | 111 | |||
110 | @host_makefile_frag@ | 112 | @host_makefile_frag@ | |
111 | 113 | |||
112 | INCDIR=$(srcdir)/$(MULTISRCTOP)../include | 114 | INCDIR=$(srcdir)/$(MULTISRCTOP)../include | |
113 | 115 |
--- src/external/gpl3/gcc/dist/libiberty/configure 2011/06/21 01:23:29 1.1.1.1
+++ src/external/gpl3/gcc/dist/libiberty/configure 2014/02/23 01:59:40 1.2
@@ -6837,27 +6837,27 @@ L="" | @@ -6837,27 +6837,27 @@ L="" | |||
6837 | for l in x $LIBOBJS; do | 6837 | for l in x $LIBOBJS; do | |
6838 | case $l in | 6838 | case $l in | |
6839 | x) ;; | 6839 | x) ;; | |
6840 | *) L="$L ./$l" ;; | 6840 | *) L="$L ./$l" ;; | |
6841 | esac | 6841 | esac | |
6842 | done | 6842 | done | |
6843 | LIBOBJS="$L" | 6843 | LIBOBJS="$L" | |
6844 | 6844 | |||
6845 | 6845 | |||
6846 | 6846 | |||
6847 | 6847 | |||
6848 | 6848 | |||
6849 | # We need multilib support, but only if configuring for the target. | 6849 | # We need multilib support, but only if configuring for the target. | |
6850 | ac_config_files="$ac_config_files Makefile testsuite/Makefile" | 6850 | ac_config_files="$ac_config_files Makefile" | |
6851 | 6851 | |||
6852 | ac_config_commands="$ac_config_commands default" | 6852 | ac_config_commands="$ac_config_commands default" | |
6853 | 6853 | |||
6854 | cat >confcache <<\_ACEOF | 6854 | cat >confcache <<\_ACEOF | |
6855 | # This file is a shell script that caches the results of configure | 6855 | # This file is a shell script that caches the results of configure | |
6856 | # tests run on this system so they can be shared between configure | 6856 | # tests run on this system so they can be shared between configure | |
6857 | # scripts and configure runs, see configure's option --config-cache. | 6857 | # scripts and configure runs, see configure's option --config-cache. | |
6858 | # It is not useful on other systems. If it contains results you don't | 6858 | # It is not useful on other systems. If it contains results you don't | |
6859 | # want to keep, you may remove or edit it. | 6859 | # want to keep, you may remove or edit it. | |
6860 | # | 6860 | # | |
6861 | # config.status only pays attention to the cache file if you give it | 6861 | # config.status only pays attention to the cache file if you give it | |
6862 | # the --recheck option to rerun configure. | 6862 | # the --recheck option to rerun configure. | |
6863 | # | 6863 | # | |
@@ -7541,27 +7541,26 @@ ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD | @@ -7541,27 +7541,26 @@ ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD | |||
7541 | libiberty_topdir=${libiberty_topdir} | 7541 | libiberty_topdir=${libiberty_topdir} | |
7542 | 7542 | |||
7543 | 7543 | |||
7544 | _ACEOF | 7544 | _ACEOF | |
7545 | 7545 | |||
7546 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | 7546 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |
7547 | 7547 | |||
7548 | # Handling of arguments. | 7548 | # Handling of arguments. | |
7549 | for ac_config_target in $ac_config_targets | 7549 | for ac_config_target in $ac_config_targets | |
7550 | do | 7550 | do | |
7551 | case $ac_config_target in | 7551 | case $ac_config_target in | |
7552 | "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; | 7552 | "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; | |
7553 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 7553 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | |
7554 | "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; | |||
7555 | "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; | 7554 | "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; | |
7556 | 7555 | |||
7557 | *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 7556 | *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | |
7558 | esac | 7557 | esac | |
7559 | done | 7558 | done | |
7560 | 7559 | |||
7561 | 7560 | |||
7562 | # If the user did not use the arguments to specify the items to instantiate, | 7561 | # If the user did not use the arguments to specify the items to instantiate, | |
7563 | # then the envvar interface is used. Set only those that are not. | 7562 | # then the envvar interface is used. Set only those that are not. | |
7564 | # We use the long form for the default assignment because of an extremely | 7563 | # We use the long form for the default assignment because of an extremely | |
7565 | # bizarre bug on SunOS 4.1.3. | 7564 | # bizarre bug on SunOS 4.1.3. | |
7566 | if $ac_need_defaults; then | 7565 | if $ac_need_defaults; then | |
7567 | test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files | 7566 | test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files |
--- src/external/gpl3/gcc/dist/libiberty/configure.ac 2011/06/21 01:23:29 1.1.1.1
+++ src/external/gpl3/gcc/dist/libiberty/configure.ac 2014/02/23 01:59:40 1.2
@@ -695,27 +695,27 @@ for l in x $LIBOBJS; do | @@ -695,27 +695,27 @@ for l in x $LIBOBJS; do | |||
695 | case $l in | 695 | case $l in | |
696 | x) ;; | 696 | x) ;; | |
697 | *) L="$L ./$l" ;; | 697 | *) L="$L ./$l" ;; | |
698 | esac | 698 | esac | |
699 | done | 699 | done | |
700 | LIBOBJS="$L" | 700 | LIBOBJS="$L" | |
701 | 701 | |||
702 | dnl Required by html and install-html | 702 | dnl Required by html and install-html | |
703 | AC_SUBST(datarootdir) | 703 | AC_SUBST(datarootdir) | |
704 | AC_SUBST(docdir) | 704 | AC_SUBST(docdir) | |
705 | AC_SUBST(htmldir) | 705 | AC_SUBST(htmldir) | |
706 | 706 | |||
707 | # We need multilib support, but only if configuring for the target. | 707 | # We need multilib support, but only if configuring for the target. | |
708 | AC_CONFIG_FILES([Makefile testsuite/Makefile]) | 708 | AC_CONFIG_FILES([Makefile]) | |
709 | AC_CONFIG_COMMANDS([default], | 709 | AC_CONFIG_COMMANDS([default], | |
710 | [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h | 710 | [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h | |
711 | if test -n "$CONFIG_FILES"; then | 711 | if test -n "$CONFIG_FILES"; then | |
712 | if test -n "${with_target_subdir}"; then | 712 | if test -n "${with_target_subdir}"; then | |
713 | # FIXME: We shouldn't need to set ac_file | 713 | # FIXME: We shouldn't need to set ac_file | |
714 | ac_file=Makefile | 714 | ac_file=Makefile | |
715 | LD="${ORIGINAL_LD_FOR_MULTILIBS}" | 715 | LD="${ORIGINAL_LD_FOR_MULTILIBS}" | |
716 | . ${libiberty_topdir}/config-ml.in | 716 | . ${libiberty_topdir}/config-ml.in | |
717 | fi | 717 | fi | |
718 | fi]], | 718 | fi]], | |
719 | [[srcdir=${srcdir} | 719 | [[srcdir=${srcdir} | |
720 | host=${host} | 720 | host=${host} | |
721 | target=${target} | 721 | target=${target} |