From ef5e2427ce999383345b4717a48650deb63e6fc4 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 23 Nov 2011 08:04:23 +0100 Subject: [PATCH] [entropy] update sys-devel/base-gcc trigger to detect GCC 4.8, 4.7, 4.6 --- .../triggers/sys-devel/base-gcc/trigger | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger b/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger index 12792b9..09f95b5 100644 --- a/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger +++ b/conf/intel/entropy/triggers/sys-devel/base-gcc/trigger @@ -3,17 +3,20 @@ import subprocess from entropy.const import etpConst def configure_correct_gcc(): - gcc_target = "4.6" + gcc_targets = ["4.8", "4.7", "4.6"] uname_arch = os.uname()[4] gcc_dir = etpConst['systemroot'] + "/etc/env.d/gcc" - gcc_profile_file_pfx = uname_arch + "-pc-linux-gnu-" + gcc_target gcc_profile_file = None - for curdir, subs, files in os.walk(gcc_dir): - for fname in files: - if fname.startswith(gcc_profile_file_pfx): - gcc_profile_file = fname - break - break + for gcc_target in gcc_targets: + gcc_profile_file_pfx = uname_arch + "-pc-linux-gnu-" + gcc_target + for curdir, subs, files in os.walk(gcc_dir): + for fname in files: + if fname.startswith(gcc_profile_file_pfx): + gcc_profile_file = fname + break + break + if gcc_profile_file is not None: + break if gcc_profile_file is not None: subprocess.call(("gcc-config", gcc_profile_file))