aboutsummaryrefslogtreecommitdiff
path: root/gcc/objcp
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2021-01-05 17:46:56 +0100
committerJakub Jelinek <jakub@redhat.com>2021-01-05 17:46:56 +0100
commit8ea81f56140ed8e09cdae93ce8d94a37e35cb586 (patch)
tree1a165695923b2f5a5ab1de9cbfe55f7510f3d286 /gcc/objcp
parent33a63257701c8d94ee375e32ff1837c989d8ded6 (diff)
downloadgcc-8ea81f56140ed8e09cdae93ce8d94a37e35cb586.zip
gcc-8ea81f56140ed8e09cdae93ce8d94a37e35cb586.tar.gz
gcc-8ea81f56140ed8e09cdae93ce8d94a37e35cb586.tar.bz2
Don't link cc1 etc. against libcody.a
Richi complained on IRC that cc1 is linked against libcody.a. From my understanding, it is just the cc1plus and cc1objplus binaries that need it, so this patch links only those against it. > this is already part of my Solaris libcody patch The following updated patch are the incremental changes between what Rainer has committed and what I've posted. 2021-01-05 Jakub Jelinek <jakub@redhat.com> gcc/cp/ * Make-lang.in (cc1plus-checksum, cc1plus$(exeext): Add $(CODYLIB) after $(BACKEND). gcc/objcp/ * Make-lang.in (cc1objplus-checksum, cc1objplus$(exeext): Add $(CODYLIB) after $(BACKEND).
Diffstat (limited to 'gcc/objcp')
-rw-r--r--gcc/objcp/Make-lang.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in
index a6b4745..dfa4d23 100644
--- a/gcc/objcp/Make-lang.in
+++ b/gcc/objcp/Make-lang.in
@@ -61,14 +61,14 @@ OBJCXX_OBJS = objcp/objcp-act.o objcp/objcp-lang.o objcp/objcp-decl.o \
obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o
cc1objplus-checksum.c : build/genchecksum$(build_exeext) checksum-options \
- $(OBJCXX_OBJS) $(BACKEND) $(LIBDEPS)
- build/genchecksum$(build_exeext) $(OBJCXX_OBJS) $(BACKEND) \
+ $(OBJCXX_OBJS) $(BACKEND) $(CODYLIB) $(LIBDEPS)
+ build/genchecksum$(build_exeext) $(OBJCXX_OBJS) $(BACKEND) $(CODYLIB) \
$(LIBDEPS) checksum-options > cc1objplus-checksum.c.tmp && \
$(srcdir)/../move-if-change cc1objplus-checksum.c.tmp \
cc1objplus-checksum.c
cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) \
- $(LIBDEPS) $(obj-c++.prev)
+ $(CODYLIB) $(LIBDEPS) $(obj-c++.prev)
@$(call LINK_PROGRESS,$(INDEX.obj-c++),start)
+$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
$(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) \