Page MenuHomeFreeBSD
Files F145009569

D15127.id44552.diff
No OneTemporary
Actions

D15127.id44552.diff
View Options

Index: head/contrib/gcc/cppdefault.c
===================================================================
--- head/contrib/gcc/cppdefault.c
+++ head/contrib/gcc/cppdefault.c
@@ -48,7 +48,7 @@
= {
#ifdef GPLUSPLUS_INCLUDE_DIR
/* Pick up GNU C++ generic include files. */
- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
#endif
#ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
/* Pick up GNU C++ target-dependent include files. */
@@ -56,7 +56,7 @@
#endif
#ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
/* Pick up GNU C++ backward and deprecated include files. */
- { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
#endif
#ifdef LOCAL_INCLUDE_DIR
/* /usr/local/include comes before the fixincluded header files. */
Index: head/gnu/usr.bin/cc/Makefile.inc
===================================================================
--- head/gnu/usr.bin/cc/Makefile.inc
+++ head/gnu/usr.bin/cc/Makefile.inc
@@ -25,6 +25,7 @@
.if ${TARGET_ARCH} != ${MACHINE_ARCH}
CFLAGS+= -DCROSS_DIRECTORY_STRUCTURE
+CFLAGS+= -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
.endif
.if ${TARGET_CPUARCH} == "arm"
Index: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
===================================================================
--- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -15,14 +15,10 @@
#undef LOCAL_INCLUDE_DIR /* We don't wish to support one. */
/* Look for the include files in the system-defined places. */
-#define GPLUSPLUS_INCLUDE_DIR PREFIX"/include/c++/"GCCVER
-#define GPLUSPLUS_BACKWARD_INCLUDE_DIR PREFIX"/include/c++/"GCCVER"/backward"
+#define GPLUSPLUS_INCLUDE_DIR "/usr/include/c++/"GCCVER
+#define GPLUSPLUS_BACKWARD_INCLUDE_DIR "/usr/include/c++/"GCCVER"/backward"
#define GCC_INCLUDE_DIR PREFIX"/include/gcc/"GCCVER
-#ifdef CROSS_DIRECTORY_STRUCTURE
-#define CROSS_INCLUDE_DIR PREFIX"/include"
-#else
-#define STANDARD_INCLUDE_DIR PREFIX"/include"
-#endif
+#define STANDARD_INCLUDE_DIR "/usr/include"
/* Under FreeBSD, the normal location of the compiler back ends is the
/usr/libexec directory.

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 16, 12:26 AM (7 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28761453
Default Alt Text
D15127.id44552.diff (2 KB)

Event Timeline