Default to just `g++`. Check GCC version and warn if we are compiling

under something before 4.7.0

2 files changed, 7 insertions, 1 deletions

diff --git a/configure.py b/configure.py
index 9b5a5102c..ef89e91cc 100755
--- a/configure.py
+++ b/configure.py
@@ -1759,6 +1759,12 @@ def main(argv = None):
                 gcc_version = stdout.strip()
 
                 logging.info('Detected gcc version %s' % (gcc_version))
+
+                (gcc_major, gcc_minor, gcc_patch) = map(int, gcc_version.split('.'))
+
+                if gcc_major == 4 and gcc_minor < 7:
+                    logging.warning('GCC 4.7.0 or higher is required')
+
                 return gcc_version
             except OSError:
                 logging.warning('Could not execute %s for version check' % (gcc_bin))
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 38fe5a5e4..33b0cbfe6 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,6 +1,6 @@
 macro_name GCC
 
-binary_name g++-4.7.0
+binary_name g++
 
 compile_option "-c "
 output_to_option "-o "