On Thu, Oct 23, 2014 at 04:31:36PM +0200, Richard Biener wrote:
>
> Final try for today.
>
> Richard.
>
> Index: gcc/Makefile.in
> ===================================================================
> --- gcc/Makefile.in (revision 216590)
> +++ gcc/Makefile.in (working copy)
> @@ -981,7 +981,15 @@ else
> LIBIBERTY = ../libiberty/libiberty.a
> BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a
> endif
> +# For stage1 and when cross-compiling use the build libcpp which is
> +# built with NLS disabled. For stage2+ use the host library and
> +# its dependencies.
> +ifeq ($(build_objdir),$(build_libobjdir))
> BUILD_CPPLIB = $(build_libobjdir)/libcpp/libcpp.a
> +else
> +BUILD_CPPLIB = $(CPPLIB) $(LIBIBERTY) $(LIBINTL) $(LIBICONV) $(LIBINTL_DEP)
> $(LIBICONV_DEP)
The $(LIBINTL_DEP) $(LIBICONV_DEP) on the above line is unnecessary IMHO,
# Rule for the generator programs:
$(genprog:%=build/gen%$(build_exeext)): build/gen%$(build_exeext): build/gen%.o
$(BUILD_LIBDEPS)
+$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \
$(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS)
adds that automatically.
> +build/genmatch$(build_exeext): BUILD_LIBDEPS += $(LIBINTL_DEP)
> $(LIBICONV_DEP)
Here it is needed supposedly.
> +endif
>
> # Dependencies on the intl and portability libraries.
> LIBDEPS= libcommon.a $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) \
Jakub
