diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-07-03 14:16:59 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-07-03 14:16:59 +0000 |
| commit | d4360477682363406d83d61bedcdfcfd6d7af488 (patch) | |
| tree | cf24b692c1a3b4105d4d0c2d499b906f348c37cd /gcc/objcp | |
| parent | 9dc9ae7437b85eaed48bdc32d796af3a88f2b50f (diff) | |
| download | gcc-d4360477682363406d83d61bedcdfcfd6d7af488.zip gcc-d4360477682363406d83d61bedcdfcfd6d7af488.tar.gz gcc-d4360477682363406d83d61bedcdfcfd6d7af488.tar.bz2 | |
configure.ac: Set srcdir when sourcing config-lang.in fragments.
* configure.ac: Set srcdir when sourcing config-lang.in fragments.
* configure: Rebuilt.
gcc/objcp/
* config-lang.in: Source cp/config-lang.in, sort objc++ gtfiles list.
From-SVN: r249922
Diffstat (limited to 'gcc/objcp')
| -rw-r--r-- | gcc/objcp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/objcp/config-lang.in | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index 817b6d4..5b4b6bd 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,7 @@ +2017-07-03 Nathan Sidwell <nathan@acm.org> + + * config-lang.in: Source cp/config-lang.in, sort objc++ gtfiles list. + 2017-06-02 Nathan Sidwell <nathan@acm.org> * objcp-decl.h (SIZEOF_OBJC_TYPE_LANG_SPECIFIC): Use lang_type. diff --git a/gcc/objcp/config-lang.in b/gcc/objcp/config-lang.in index 0418094..5d2b1de 100644 --- a/gcc/objcp/config-lang.in +++ b/gcc/objcp/config-lang.in @@ -43,8 +43,20 @@ subdir_requires="objc cp" # avoid having the GC stuff from that header being added to gtype-cp.h # or gtype-objc.h. -# This list is separated in two parts: the first one is identical to -# the C++ one, the second one contains our ObjC++ additions. -gtfiles="\$(srcdir)/cp/rtti.c \$(srcdir)/cp/mangle.c \$(srcdir)/cp/name-lookup.h \$(srcdir)/cp/name-lookup.c \$(srcdir)/cp/cp-tree.h \$(srcdir)/cp/decl.h \$(srcdir)/cp/call.c \$(srcdir)/cp/decl.c \$(srcdir)/cp/decl2.c \$(srcdir)/cp/pt.c \$(srcdir)/cp/repo.c \$(srcdir)/cp/semantics.c \$(srcdir)/cp/tree.c \$(srcdir)/cp/parser.h \$(srcdir)/cp/parser.c \$(srcdir)/cp/method.c \$(srcdir)/cp/typeck2.c \$(srcdir)/c-family/c-common.c \$(srcdir)/c-family/c-common.h \$(srcdir)/c-family/c-objc.h \$(srcdir)/c-family/c-lex.c \$(srcdir)/c-family/c-pragma.h \$(srcdir)/c-family/c-pragma.c \$(srcdir)/cp/class.c \$(srcdir)/cp/cp-objcp-common.c \$(srcdir)/cp/except.c \$(srcdir)/cp/vtable-class-hierarchy.c \$(srcdir)/cp/constexpr.c \$(srcdir)/cp/cp-gimplify.c \ -\$(srcdir)/objc/objc-map.h \$(srcdir)/objc/objc-act.h \$(srcdir)/objc/objc-act.c \$(srcdir)/objc/objc-runtime-shared-support.c \$(srcdir)/objc/objc-gnu-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-01.c \$(srcdir)/objc/objc-next-runtime-abi-02.c \$(srcdir)/c-family/c-cppbuiltin.c" +# Get the C++ FE's gtfiles list. Do this in a subshell, so we can +# extract exactly the gtfiles var, but munge cp-lang.c into objcp-lang.c. +gtfiles="$(. $srcdir/cp/config-lang.in ; \ + echo $gtfiles | sed 's+/cp/cp-lang.c +/objcp/objcp-lang.c +')" + +# Now add our special bits to it. Please keep this list sorted. +gtfiles="$gtfiles \ +\$(srcdir)/objc/objc-act.h \ +\$(srcdir)/objc/objc-map.h \ +\$(srcdir)/c-family/c-cppbuiltin.c \ +\$(srcdir)/objc/objc-act.c \ +\$(srcdir)/objc/objc-gnu-runtime-abi-01.c \ +\$(srcdir)/objc/objc-next-runtime-abi-01.c \ +\$(srcdir)/objc/objc-next-runtime-abi-02.c \ +\$(srcdir)/objc/objc-runtime-shared-support.c \ +" |