summaryrefslogtreecommitdiffstats
path: root/contrib/gcc/cppdefault.c
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2013-11-21 16:38:57 +0000
committerpfg <pfg@FreeBSD.org>2013-11-21 16:38:57 +0000
commit3972b5f3cb8868deaacced6971ec71433c3dab40 (patch)
tree96688663ab2bd665ffb1db7e8d0122835df5086e /contrib/gcc/cppdefault.c
parent20cd614dbb55fc5790f00533e96f871386a18cc2 (diff)
downloadFreeBSD-src-3972b5f3cb8868deaacced6971ec71433c3dab40.zip
FreeBSD-src-3972b5f3cb8868deaacced6971ec71433c3dab40.tar.gz
gcc: another round of merges from the gcc pre-43 branch.
Bring The following revisions from the gcc43 branch[1]: 118360, 118361, 118363, 118576, 119820, 123906, 125246, and 125721. They all have in common that the were merged long ago into Apple's gcc and should help improve the general quality of the compiler and make it easier to bring new features from Apple's gcc42. For details please review the additions to the files: gcc/ChangeLog.gcc43 gcc/cp/ChangeLog.gcc43 (new, adds previous revisions) Reference: [1] http://gcc.gnu.org/viewcvs/gcc/trunk/?pathrev=126700 Obtained from: gcc pre4.3 (GPLv2) branch MFC after: 3 weeks
Diffstat (limited to 'contrib/gcc/cppdefault.c')
-rw-r--r--contrib/gcc/cppdefault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gcc/cppdefault.c b/contrib/gcc/cppdefault.c
index d040558..4346660 100644
--- a/contrib/gcc/cppdefault.c
+++ b/contrib/gcc/cppdefault.c
@@ -33,7 +33,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#define STANDARD_INCLUDE_COMPONENT 0
#endif
-#if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT)
+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
# undef LOCAL_INCLUDE_DIR
# undef SYSTEM_INCLUDE_DIR
# undef STANDARD_INCLUDE_DIR
OpenPOWER on IntegriCloud