diff options
author | gerald <gerald@FreeBSD.org> | 2016-08-25 04:05:40 +0800 |
---|---|---|
committer | gerald <gerald@FreeBSD.org> | 2016-08-25 04:05:40 +0800 |
commit | f27bfa81b1fe1a1524d3fc2ef54da7298f60d12a (patch) | |
tree | 314d75f364ccf54aa953f014ed5fc906237d1f40 /lang | |
parent | cf0a8d7108eb12b42b80276b1f1b0863c510f842 (diff) | |
download | freebsd-ports-gnome-f27bfa81b1fe1a1524d3fc2ef54da7298f60d12a.tar.gz freebsd-ports-gnome-f27bfa81b1fe1a1524d3fc2ef54da7298f60d12a.tar.zst freebsd-ports-gnome-f27bfa81b1fe1a1524d3fc2ef54da7298f60d12a.zip |
Default powerpc64 to bootstrapping (option BOOTSTRAP) since otherwise
GCC can be mis-built, leading to an internal compiler error building
libgcc/libgcov.c, at least on FreeBSD 11.
Adjust OPTIONS_DEFINE_powerpc64 and OPTIONS_DEFAULT_powerpc64
incrementally (with +=) to avoid overwriting settings defined
at the top of the Makefile (or child ports). [1]
Submitted by: swills [1]
Reported by: swills
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gcc/Makefile | 5 | ||||
-rw-r--r-- | lang/gcc48/Makefile | 5 | ||||
-rw-r--r-- | lang/gcc5/Makefile | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index f922d3d62181..551be7766464 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -42,12 +42,13 @@ OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_DEFAULT_powerpc64= BOOTSTRAP OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .if exists(/usr/lib32/libc.so) -OPTIONS_DEFINE_powerpc64= MULTILIB -OPTIONS_DEFAULT_powerpc64= MULTILIB +OPTIONS_DEFINE_powerpc64+= MULTILIB +OPTIONS_DEFAULT_powerpc64+= MULTILIB MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 73e45fbab0e5..4c42e6603bec 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -45,12 +45,13 @@ OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT= BOOTSTRAP OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_DEFAULT_powerpc64= BOOTSTRAP OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .if exists(/usr/lib32/libc.so) -OPTIONS_DEFINE_powerpc64= MULTILIB -OPTIONS_DEFAULT_powerpc64= MULTILIB +OPTIONS_DEFINE_powerpc64+= MULTILIB +OPTIONS_DEFAULT_powerpc64+= MULTILIB MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile index d289b9c1c2b0..934473fc5388 100644 --- a/lang/gcc5/Makefile +++ b/lang/gcc5/Makefile @@ -50,8 +50,8 @@ BOOTSTRAP_DESC= Build using a full bootstrap GRAPHITE_DESC= Support for Graphite loop optimizations .if exists(/usr/lib32/libc.so) -OPTIONS_DEFINE_powerpc64= MULTILIB -OPTIONS_DEFAULT_powerpc64= MULTILIB +OPTIONS_DEFINE_powerpc64+= MULTILIB +OPTIONS_DEFAULT_powerpc64+= MULTILIB MULTILIB_DESC= Build support for 32-bit and 64-bit targets MULTILIB_CONFIGURE_ENABLE= multilib .else |