Changeset 7f25c4e in mainline

Timestamp:

2013-03-12T07:11:52Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

878e181

Parents:

36ceaac

Message:

Unbreak mips builds (extra CC arguments)

File:

• tools/autotool.py (modified) (7 diffs)

tools/autotool.py

@@ -186 +186 @@
         gnu_target = None
         clang_target = None
+        cc_args = []
         
         if (config['PLATFORM'] == "abs32le"):
@@ -221 +222 @@
         if (config['PLATFORM'] == "mips32"):
                 check_config(config, "MACHINE")
-                common['CC_ARGS'].append("-mabi=32")
+                cc_args.append("-mabi=32")
                 
                 if ((config['MACHINE'] == "lgxemul") or (config['MACHINE'] == "msim")):
@@ -233 +234 @@
         if (config['PLATFORM'] == "mips64"):
                 check_config(config, "MACHINE")
-                common['CC_ARGS'].append("-mabi=64")
+                cc_args.append("-mabi=64")
                 
                 if (config['MACHINE'] == "msim"):
@@ -251 +252 @@
                              "Please contact the developers of HelenOS."])
         
-        return (target, gnu_target, clang_target)
+        return (target, cc_args, gnu_target, clang_target)
 
 def check_app(args, name, details):
@@ -713 +714 @@
                 common['CC_ARGS'] = []
                 if (config['COMPILER'] == "gcc_cross"):
-                        target, gnu_target, clang_target_unused = get_target(config)
+                        target, cc_args, gnu_target, clang_target_unused = get_target(config)
                                 
                         path = "%s/%s/bin" % (cross_prefix, target)
@@ -723 +724 @@
                         check_common(common, "GCC")
                         common['CC'] = common['GCC']
+                        common['CC_ARGS'].extend(cc_args)
                 
                 if (config['COMPILER'] == "gcc_native"):
@@ -738 +740 @@
                 
                 if (config['COMPILER'] == "clang"):
-                        target, gnu_target, clang_target = get_target(config, True)
+                        target, cc_args, gnu_target, clang_target = get_target(config, True)
                         path = "%s/%s/bin" % (cross_prefix, target)
                         prefix = "%s-" % gnu_target
                         
                         common['CC'] = "clang"
+                        common['CC_ARGS'].extend(cc_args)
                         common['CC_ARGS'].append("-target")
                         common['CC_ARGS'].append(clang_target)