From 0b74a4769fd1186325021c2e56fcddf121c7a831 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Tue, 4 Sep 2018 09:38:01 +0200
Subject: [PATCH] gcc80: Clean up two Makefiles a bit (no functional change).

Based-on: zrj's work
---
 gnu/lib/Makefile     | 11 +----------
 gnu/usr.bin/Makefile | 13 +++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 940963ad32..42bcd64af6 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -4,27 +4,18 @@
 # (duplicate WORLD_CCVER for ALTCOMPILER == all is already built and
 #  takes no extra time)
 #
+SUBDIR+= gcc80
 SUBDIR+= ${WORLD_CCVER}
 
 .if !defined(NO_ALTCOMPILER)
 . if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc47})
 SUBDIR+= gcc47
 . endif
-.endif
-
-.if !defined(NO_ALTCOMPILER)
 . if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
 SUBDIR+= gcc50
 . endif
 .endif
 
-
-#.if !defined(NO_ALTCOMPILER)
-#. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc80})
-SUBDIR+= gcc80
-#. endif
-#.endif
-
 SUBDIR+= libcryptsetup libdevmapper libdialog libluks liblvm
 SUBDIR_ORDERED=
 
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index b483dad759..5211f8ee31 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -24,27 +24,20 @@ SUBDIR+= mpc
 # gcc80 is now the default, see sys.mk for WORLD_ALTCOMPILER default
 #
 #
+SUBDIR+= cc80
+_compiler_dir= cc80
+
 .if !defined(NO_ALTCOMPILER)
 . if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc47})
 SUBDIR+= cc47
 _altcompiler_dirs+= cc47
 . endif
-.endif
-
-.if !defined(NO_ALTCOMPILER)
 . if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
 SUBDIR+= cc50
 _altcompiler_dirs+= cc50
 . endif
 .endif
 
-#.if !defined(NO_ALTCOMPILER)
-#. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc80})
-SUBDIR+= cc80
-_compiler_dir= cc80
-#. endif
-#.endif
-
 .ORDER: ${BU_PRIMARY} gmp mpfr mpc ${_compiler_dir} ${_altcompiler_dirs}
 
 # maximum parallelism
-- 
2.11.4.GIT