Changeset d15a7f8 in rtems-source-builder for source-builder/sb/freebsd.py

Timestamp:

May 21, 2015, 9:53:48 PM (6 years ago)

Author:

Nick Withers <nick.withers@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

4bd058e

Parents:

be7ffbf

git-author:

Nick Withers <nick.withers@…> (05/21/15 21:53:48)

git-committer:

Chris Johns <chrisj@…> (05/22/15 02:02:38)

Message:

Don't let a GCC port install override base Clang for FreeBSD 10+

File:

• source-builder/sb/freebsd.py (modified) (3 diffs)

source-builder/sb/freebsd.py

@@ -89 +89 @@
             cc = '/usr/bin/clang'
             if not check.check_exe(cc, cc):
-                raise error.general('no valid cc not found')
+                raise error.general('no valid cc found')
         cxx = '/usr/bin/c++'
         if check.check_exe(cxx, cxx):
@@ -96 +96 @@
             cxx = '/usr/bin/clang++'
             if check.check_exe(cxx, cxx):
-                raise error.general('no valid c++ not found')
+                raise error.general('no valid c++ found')
         #
         # Assume the compiler is clang and so we need to increase
@@ -110 +110 @@
         #
         defines['iconv_includes'] = ('none', 'none', '-I/usr/local/include -L/usr/local/lib')
-
-    for gv in ['47', '48', '49']:
-        gcc = '%s-portbld-freebsd%s-gcc%s' % (cpu, version, gv)
-        if check.check_exe(gcc, gcc):
-            defines['__cc'] = gcc
-            break
-    for gv in ['47', '48', '49']:
-        gxx = '%s-portbld-freebsd%s-g++%s' % (cpu, version, gv)
-        if check.check_exe(gxx, gxx):
-            defines['__cxx'] = gxx
-            break
+    else:
+        for gv in ['49', '48', '47']:
+            gcc = '%s-portbld-freebsd%s-gcc%s' % (cpu, version, gv)
+            if check.check_exe(gcc, gcc):
+                defines['__cc'] = gcc
+                break
+        for gv in ['49', '48', '47']:
+            gxx = '%s-portbld-freebsd%s-g++%s' % (cpu, version, gv)
+            if check.check_exe(gxx, gxx):
+                defines['__cxx'] = gxx
+                break
 
     return defines