From patchwork Tue Nov 30 05:40:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ehren Metcalfe X-Patchwork-Id: 73544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id DE9021007D1 for ; Tue, 30 Nov 2010 16:41:00 +1100 (EST) Received: (qmail 15720 invoked by alias); 30 Nov 2010 05:40:42 -0000 Received: (qmail 15679 invoked by uid 22791); 30 Nov 2010 05:40:41 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mail-fx0-f47.google.com (HELO mail-fx0-f47.google.com) (209.85.161.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 30 Nov 2010 05:40:36 +0000 Received: by fxm17 with SMTP id 17so3294936fxm.20 for ; Mon, 29 Nov 2010 21:40:34 -0800 (PST) MIME-Version: 1.0 Received: by 10.223.122.133 with SMTP id l5mr6329040far.52.1291095633663; Mon, 29 Nov 2010 21:40:33 -0800 (PST) Received: by 10.223.73.196 with HTTP; Mon, 29 Nov 2010 21:40:33 -0800 (PST) Date: Tue, 30 Nov 2010 00:40:33 -0500 Message-ID: Subject: [PATCH] fix misplaced c-family headers in plugin include directory From: Ehren Metcalfe To: Mingjie Xing , Ralf Wildenhues , "Joseph S. Myers" , gcc-patches@gcc.gnu.org X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org In addition to the problems addressed by http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02752.html, there is an issue with c-family headers being put in the main plugin include directory rather than the c-family subdir. This breaks all headers like cp-tree.h etc that #include "c-family/blah.h". Also, the testsuite plugin examples have already been updated to use the c-family dir (so with this and Mingjie Xing's patch they'll work again). Index: gcc/Makefile.in =================================================================== --- gcc/Makefile.in (revision 167286) +++ gcc/Makefile.in (working copy) @@ -4576,8 +4576,8 @@ # Install the headers needed to build a plugin. install-plugin: installdirs lang.install-plugin s-header-vars -# We keep the directory structure for files in config and .def files. All -# other files are flattened to a single directory. +# We keep the directory structure for files in config, c-family and +# .def files. All other files are flattened to a single directory. $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`; \ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ @@ -4589,7 +4589,7 @@ else continue; \ fi; \ case $$path in \ - "$(srcdir)"/config/* | "$(srcdir)"/*.def ) \ + "$(srcdir)"/config/* | "$(srcdir)"/c-family/* | "$(srcdir)"/*.def ) \ base=`echo "$$path" | sed -e "s|$$srcdirstrip/||"`;; \ *) base=`basename $$path` ;; \ esac; \