diff options
| author | Jason Merrill <jason@redhat.com> | 2015-08-08 22:11:48 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2015-08-08 22:11:48 +0000 |
| commit | a989e71d4dccab6098ab1439c6a38d13d52ddcdf (patch) | |
| tree | ad358b107f066c61624f50b9107148fb1c3c91cb | |
| parent | 5b769f898c67d115eb2f67b8c0d6378f557baf65 (diff) | |
break make with note about merge to trunkc++-concepts
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/c++-concepts@226742 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/Makefile.in | 3 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index bd39467d9ea..f16ff0c6325 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -27,6 +27,9 @@ # Set by autoconf to "all.internal" for a native build, or # "all.cross" to build a cross compiler. all: @ALL@ + @echo "*** THIS BRANCH IS NO LONGER UNDER DEVELOPMENT ***" + @echo "*** CONCEPTS HAS BEEN MERGED INTO TRUNK ***" + @false # Depend on this to specify a phony target portably. force: diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index a16f228146c..30c89b5640a 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -97,6 +97,9 @@ cc1plus-checksum.c : build/genchecksum$(build_exeext) checksum-options \ $(srcdir)/../move-if-change cc1plus-checksum.c.tmp cc1plus-checksum.c cc1plus$(exeext): $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBDEPS) + @echo "*** THIS BRANCH IS NO LONGER UNDER DEVELOPMENT ***" + @echo "*** CONCEPTS HAS BEEN MERGED INTO TRUNK ***" + @false +$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(CXX_OBJS) cc1plus-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS) |