svn commit: r258445 - in head/gnu/usr.bin/cc: . cc_tools

[Andreas Tobler]

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"