Makefile.def: Add libcpp build module and dependencies.
2014-10-23 Richard Biener <rguenther@suse.de> * Makefile.def: Add libcpp build module and dependencies. * configure.ac: Add libcpp build module. * Makefile.in: Regenerate. * configure: Likewise. gcc/ * Makefile.in (BUILD_CPPLIB): Add. (build/genmatch$(build_exeext)): Use BUILD_CPPLIB, not CPPLIB. Drop LIBIBERTY. From-SVN: r216579
This commit is contained in:
Richard Biener
Richard Biener
parent
282d3a81fa
commit
929315a917
7 changed files with 88 additions and 3 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2014-10-23 Richard Biener <rguenther@suse.de>
|
||||
|
||||
* Makefile.def: Add libcpp build module and dependencies.
|
||||
* configure.ac: Add libcpp build module.
|
||||
* Makefile.in: Regenerate.
|
||||
* configure: Likewise.
|
||||
|
||||
2014-10-15 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* MAINTAINERS (write-after-approval): Add myself.
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ build_modules= { module= flex; };
|
|||
build_modules= { module= m4; };
|
||||
build_modules= { module= texinfo; };
|
||||
build_modules= { module= fixincludes; };
|
||||
build_modules= { module= libcpp;
|
||||
extra_configure_flags='--disable-nls am_cv_func_iconv=no';};
|
||||
|
||||
host_modules= { module= bfd; bootstrap=true; };
|
||||
host_modules= { module= opcodes; bootstrap=true; };
|
||||
|
|
@ -301,6 +303,7 @@ dependencies = { module=all-build-flex; on=all-build-m4; };
|
|||
dependencies = { module=all-build-libiberty; on=all-build-texinfo; };
|
||||
dependencies = { module=all-build-m4; on=all-build-texinfo; };
|
||||
dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
|
||||
dependencies = { module=all-build-libcpp; on=all-build-libiberty; };
|
||||
|
||||
// Host modules specific to gcc.
|
||||
dependencies = { module=configure-gcc; on=configure-intl; };
|
||||
|
|
@ -321,6 +324,7 @@ dependencies = { module=all-gcc; on=all-build-bison; };
|
|||
dependencies = { module=all-gcc; on=all-build-flex; };
|
||||
dependencies = { module=all-gcc; on=all-build-libiberty; };
|
||||
dependencies = { module=all-gcc; on=all-build-fixincludes; };
|
||||
dependencies = { module=all-gcc; on=all-build-libcpp; };
|
||||
dependencies = { module=all-gcc; on=all-zlib; };
|
||||
dependencies = { module=all-gcc; on=all-libbacktrace; hard=true; };
|
||||
dependencies = { module=all-gcc; on=all-libcpp; hard=true; };
|
||||
|
|
|
|||
67
Makefile.in
67
Makefile.in
|
|
@ -991,6 +991,7 @@ all-build: maybe-all-build-flex
|
|||
all-build: maybe-all-build-m4
|
||||
all-build: maybe-all-build-texinfo
|
||||
all-build: maybe-all-build-fixincludes
|
||||
all-build: maybe-all-build-libcpp
|
||||
|
||||
.PHONY: all-host
|
||||
|
||||
|
|
@ -3005,6 +3006,63 @@ all-build-fixincludes: configure-build-fixincludes
|
|||
|
||||
|
||||
|
||||
.PHONY: configure-build-libcpp maybe-configure-build-libcpp
|
||||
maybe-configure-build-libcpp:
|
||||
@if gcc-bootstrap
|
||||
configure-build-libcpp: stage_current
|
||||
@endif gcc-bootstrap
|
||||
@if build-libcpp
|
||||
maybe-configure-build-libcpp: configure-build-libcpp
|
||||
configure-build-libcpp:
|
||||
@: $(MAKE); $(unstage)
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
test ! -f $(BUILD_SUBDIR)/libcpp/Makefile || exit 0; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libcpp ; \
|
||||
$(BUILD_EXPORTS) \
|
||||
echo Configuring in $(BUILD_SUBDIR)/libcpp; \
|
||||
cd "$(BUILD_SUBDIR)/libcpp" || exit 1; \
|
||||
case $(srcdir) in \
|
||||
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
|
||||
*) topdir=`echo $(BUILD_SUBDIR)/libcpp/ | \
|
||||
sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
|
||||
esac; \
|
||||
module_srcdir=libcpp; \
|
||||
rm -f no-such-file || : ; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) \
|
||||
$$s/$$module_srcdir/configure \
|
||||
--srcdir=$${topdir}/$$module_srcdir \
|
||||
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
|
||||
--target=${target_alias} --disable-nls am_cv_func_iconv=no \
|
||||
|| exit 1
|
||||
@endif build-libcpp
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.PHONY: all-build-libcpp maybe-all-build-libcpp
|
||||
maybe-all-build-libcpp:
|
||||
@if gcc-bootstrap
|
||||
all-build-libcpp: stage_current
|
||||
@endif gcc-bootstrap
|
||||
@if build-libcpp
|
||||
TARGET-build-libcpp=all
|
||||
maybe-all-build-libcpp: all-build-libcpp
|
||||
all-build-libcpp: configure-build-libcpp
|
||||
@: $(MAKE); $(unstage)
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(BUILD_EXPORTS) \
|
||||
(cd $(BUILD_SUBDIR)/libcpp && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
|
||||
$(TARGET-build-libcpp))
|
||||
@endif build-libcpp
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# --------------------------------------
|
||||
# Modules which run on the host machine
|
||||
# --------------------------------------
|
||||
|
|
@ -48047,6 +48105,7 @@ all-build-flex: maybe-all-build-m4
|
|||
all-build-libiberty: maybe-all-build-texinfo
|
||||
all-build-m4: maybe-all-build-texinfo
|
||||
all-build-fixincludes: maybe-all-build-libiberty
|
||||
all-build-libcpp: maybe-all-build-libiberty
|
||||
configure-gcc: maybe-configure-intl
|
||||
|
||||
configure-stage1-gcc: maybe-configure-stage1-intl
|
||||
|
|
@ -48191,6 +48250,14 @@ all-stage3-gcc: maybe-all-build-fixincludes
|
|||
all-stage4-gcc: maybe-all-build-fixincludes
|
||||
all-stageprofile-gcc: maybe-all-build-fixincludes
|
||||
all-stagefeedback-gcc: maybe-all-build-fixincludes
|
||||
all-gcc: maybe-all-build-libcpp
|
||||
|
||||
all-stage1-gcc: maybe-all-build-libcpp
|
||||
all-stage2-gcc: maybe-all-build-libcpp
|
||||
all-stage3-gcc: maybe-all-build-libcpp
|
||||
all-stage4-gcc: maybe-all-build-libcpp
|
||||
all-stageprofile-gcc: maybe-all-build-libcpp
|
||||
all-stagefeedback-gcc: maybe-all-build-libcpp
|
||||
all-gcc: maybe-all-zlib
|
||||
|
||||
all-stage1-gcc: maybe-all-stage1-zlib
|
||||
|
|
|
|||
2
configure
vendored
2
configure
vendored
|
|
@ -2713,7 +2713,7 @@ extra_host_args=
|
|||
# these library is used by various programs built for the build
|
||||
# environment
|
||||
#
|
||||
build_libs="build-libiberty"
|
||||
build_libs="build-libiberty build-libcpp"
|
||||
|
||||
# these tools are built for the build environment
|
||||
build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ extra_host_args=
|
|||
# these library is used by various programs built for the build
|
||||
# environment
|
||||
#
|
||||
build_libs="build-libiberty"
|
||||
build_libs="build-libiberty build-libcpp"
|
||||
|
||||
# these tools are built for the build environment
|
||||
build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
2014-10-23 Richard Biener <rguenther@suse.de>
|
||||
|
||||
* Makefile.in (BUILD_CPPLIB): Add.
|
||||
(build/genmatch$(build_exeext)): Use BUILD_CPPLIB, not CPPLIB.
|
||||
Drop LIBIBERTY.
|
||||
|
||||
2014-10-23 Richard Biener <rguenther@suse.de>
|
||||
|
||||
* fold-const.c (fold_binary_loc): Preserve side-effects of
|
||||
|
|
|
|||
|
|
@ -981,6 +981,7 @@ else
|
|||
LIBIBERTY = ../libiberty/libiberty.a
|
||||
BUILD_LIBIBERTY = $(build_libobjdir)/libiberty/libiberty.a
|
||||
endif
|
||||
BUILD_CPPLIB = $(build_libobjdir)/libcpp/libcpp.a
|
||||
|
||||
# Dependencies on the intl and portability libraries.
|
||||
LIBDEPS= libcommon.a $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) \
|
||||
|
|
@ -2520,7 +2521,7 @@ genprog = $(genprogerr) check checksum condmd match
|
|||
# These programs need libs over and above what they get from the above list.
|
||||
build/genautomata$(build_exeext) : BUILD_LIBS += -lm
|
||||
|
||||
build/genmatch$(build_exeext) : $(CPPLIB) $(LIBIBERTY) \
|
||||
build/genmatch$(build_exeext) : $(BUILD_CPPLIB) \
|
||||
$(BUILD_ERRORS) build/vec.o build/hash-table.o
|
||||
|
||||
# These programs are not linked with the MD reader.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue