From owner-svn-src-head@FreeBSD.ORG  Thu Nov 21 21:05:12 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 439B6453;
 Thu, 21 Nov 2013 21:05:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 335D72620;
 Thu, 21 Nov 2013 21:05:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALL5CIQ058466;
 Thu, 21 Nov 2013 21:05:12 GMT
 (envelope-from andreast@svn.freebsd.org)
Received: (from andreast@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALL5B3m058462;
 Thu, 21 Nov 2013 21:05:11 GMT
 (envelope-from andreast@svn.freebsd.org)
Message-Id: <201311212105.rALL5B3m058462@svn.freebsd.org>
From: Andreas Tobler <andreast@FreeBSD.org>
Date: Thu, 21 Nov 2013 21:05:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258445 - in head/gnu/usr.bin/cc: . cc_tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2013 21:05:12 -0000

Author: andreast
Date: Thu Nov 21 21:05:11 2013
New Revision: 258445
URL: http://svnweb.freebsd.org/changeset/base/258445

Log:
  Fix cross compilation after r258428.
  
  Reviewed by:	pfg

Modified:
  head/gnu/usr.bin/cc/Makefile.inc
  head/gnu/usr.bin/cc/cc_tools/freebsd-native.h

Modified: head/gnu/usr.bin/cc/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.inc	Thu Nov 21 20:43:43 2013	(r258444)
+++ head/gnu/usr.bin/cc/Makefile.inc	Thu Nov 21 21:05:11 2013	(r258445)
@@ -23,7 +23,7 @@ CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\
 CSTD?=	gnu89
 
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
-CFLAGS+=	-DCROSS_COMPILE
+CFLAGS+=	-DCROSS_DIRECTORY_STRUCTURE
 .endif
 
 .if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"

Modified: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h	Thu Nov 21 20:43:43 2013	(r258444)
+++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h	Thu Nov 21 21:05:11 2013	(r258445)
@@ -18,7 +18,7 @@
 #define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/"GCCVER
 #define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/"GCCVER"/backward"
 #define GCC_INCLUDE_DIR			PREFIX"/include/gcc/"GCCVER
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #define CROSS_INCLUDE_DIR		PREFIX"/include"
 #else
 #define STANDARD_INCLUDE_DIR		PREFIX"/include"