From patchwork Tue Jun 7 04:37:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas B Rupp X-Patchwork-Id: 99073 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 CB8BFB6F9B for ; Tue, 7 Jun 2011 14:37:50 +1000 (EST) Received: (qmail 6094 invoked by alias); 7 Jun 2011 04:37:47 -0000 Received: (qmail 5872 invoked by uid 22791); 7 Jun 2011 04:37:44 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 07 Jun 2011 04:37:30 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id ABCFA2BB080; Tue, 7 Jun 2011 00:37:29 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id KP2PzoNDsGJD; Tue, 7 Jun 2011 00:37:29 -0400 (EDT) Received: from [192.168.1.104] (dpc6682073249.direcpc.com [66.82.73.249]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id B974A2BB03A; Tue, 7 Jun 2011 00:37:26 -0400 (EDT) Message-ID: <4DEDAAFB.8050302@gnat.com> Date: Mon, 06 Jun 2011 21:37:15 -0700 From: Douglas B Rupp User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.17) Gecko/20110414 Thunderbird/3.1.10 MIME-Version: 1.0 To: bkorb@gnu.org CC: gcc-patches@gcc.gnu.org Subject: [PATCH] fixincludes/Makefile for Interix Rev 2 References: <4DE9132E.3080205@gnat.com> <4DEA98E4.3070402@gnat.com> <4DEBBA7A.30906@gnu.org> In-Reply-To: <4DEBBA7A.30906@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 Revised and retested patch attached. OK to commit? --Douglas Rupp 2011-06-06 Douglas B Rupp * fixincludes/configure.ac (host_makefile_frag): Use mh-interix. * fixincludes/configure: Regenerate * fixincludes/Makefile.in (FIXINC_CPPFLAGS): New flag macro. (@host_makefile_frag@): New substitution placeholder. (.c.o): Use FIXINC_CPPFLAGS. diff -rupN gcc.orig/fixincludes/configure.ac gcc/fixincludes/configure.ac --- gcc.orig/fixincludes/configure.ac 2011-04-06 17:01:09.000000000 -0700 +++ gcc/fixincludes/configure.ac 2011-06-06 21:31:54.000000000 -0700 @@ -23,6 +23,16 @@ # Determine the noncanonical target name, for directory use. ACX_NONCANONICAL_TARGET +[host_makefile_frag=/dev/null +if test -d ${srcdir}/../config ; then +case "${host}" in + *-interix[3-9]*) + host_makefile_frag="${srcdir}/../config/mh-interix" + ;; +esac +fi] +AC_SUBST_FILE(host_makefile_frag) + # Specify the local prefix local_prefix= AC_ARG_WITH(local-prefix, diff -rupN gcc.orig/fixincludes/Makefile.in gcc/fixincludes/Makefile.in --- gcc.orig/fixincludes/Makefile.in 2011-04-06 17:01:09.000000000 -0700 +++ gcc/fixincludes/Makefile.in 2011-06-06 21:31:54.000000000 -0700 @@ -1,6 +1,6 @@ # Makefile for fixincludes. # -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2009, 2010 +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2009, 2010, 2011 # Free Software Foundation, Inc. #This file is part of fixincludes. @@ -32,6 +32,11 @@ LDFLAGS = @LDFLAGS@ INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include FIXINC_CFLAGS = -DHAVE_CONFIG_H $(INCLUDES) +FIXINC_CPPFLAGS = + +#### host specific makefile fragments come in here. +@host_makefile_frag@ +### # Directory where sources are, from where we are. srcdir = @srcdir@ @@ -73,7 +78,7 @@ # Now figure out from those variables how to compile and link. .c.o: - $(CC) -c $(CFLAGS) $(WARN_CFLAGS) $(CPPFLAGS) $(FIXINC_CFLAGS) $< + $(CC) -c $(CFLAGS) $(WARN_CFLAGS) $(CPPFLAGS) $(FIXINC_CPPFLAGS) $(FIXINC_CFLAGS) $< # The only suffixes we want for implicit rules are .c and .o. .SUFFIXES: