From 0e14fd92998c2da3e29545ce85df204c82b51642 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 30 Dec 2014 19:19:43 +0000 Subject: [PATCH] When building the gcc ports using a full bootstrap, tell the configure script to assume the BUILD_CONFIG is set to bootstrap-debug, instead of letting it auto-detect. With clang 3.5.0 this auto-detection can fail, due to a discrepancy [1] [2] in its debug information, when objects are produced with and without -g. When the auto-detection fails, gcc will compare objects with full debug information during the stage comparisons, and this sometimes causes those stage comparisons to fail unexpectedly. [1] http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20141222/250134.html [2] http://llvm.org/PR22046 Approved by: gerald (maintainer) --- lang/gcc/Makefile | 1 + lang/gcc46/Makefile | 1 + lang/gcc47/Makefile | 1 + lang/gcc48/Makefile | 1 + lang/gcc49/Makefile | 1 + lang/gcc5/Makefile | 1 + 6 files changed, 6 insertions(+) diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 3a2a5223338c..a95a0190ddf5 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -68,6 +68,7 @@ GNU_CONFIGURE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else +CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 763a41c03e7f..eee6eaa2c92d 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -64,6 +64,7 @@ GNU_CONFIGURE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else +CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index da96744ba7cf..07d8daa19807 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -70,6 +70,7 @@ GNU_CONFIGURE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else +CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index ab9d4650310d..bab476da6038 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -69,6 +69,7 @@ GNU_CONFIGURE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else +CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile index c6c163797c71..d5d2c6e1a0ef 100644 --- a/lang/gcc49/Makefile +++ b/lang/gcc49/Makefile @@ -69,6 +69,7 @@ GNU_CONFIGURE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else +CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile index 80c63ba803b0..8fae50741eac 100644 --- a/lang/gcc5/Makefile +++ b/lang/gcc5/Makefile @@ -69,6 +69,7 @@ GNU_CONFIGURE= yes .if empty(PORT_OPTIONS:MBOOTSTRAP) CONFIGURE_ARGS+=--disable-bootstrap .else +CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \