3 files changed, 8 insertions, 6 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index f922d3d6218..551be776646 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 73e45fbab0e..4c42e6603be 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 d289b9c1c2b..934473fc538 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