From: Kefu Chai <kchai@redhat.com>
Date: Fri, 28 Jun 2019 03:07:22 +0000 (+0800)
Subject: scripts/build_utils.sh: only use GCC-9 for building crimson
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1328%2Fhead;p=ceph-build.git

scripts/build_utils.sh: only use GCC-9 for building crimson

using GCC-9 for building mimic and other stable releases has following
consequences:

* it brings runtime dependencies of libstdc++ runtime shipped along with
  GCC-9
* GCC-9 is more picky, so some 3rd party libraries fail to build due to
  -Werror.

let's continue using GCC-8 on bionic when building non-crimson flavors

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 12ab9b920..6c27429d2 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -480,7 +480,12 @@ use_ppa() {
                 xenial)
                     use_ppa=true;;
                 bionic)
-                    use_ppa=true;;
+                    if [ "$FLAVOR" = "crimson" ]; then
+                        use_ppa=true
+                    else
+                        use_ppa=false
+                    fi
+                    ;;
                 *)
                     use_ppa=false;;
             esac