Changeset 575a6e5 for tests/pybin/settings.py

Timestamp:

Aug 9, 2018, 11:07:05 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

7a7ab42

Parents:

a5121bf

Message:

Cross compilation appears to be working

File:

• tests/pybin/settings.py (modified) (3 diffs)

tests/pybin/settings.py

@@ -29 +29 @@
         }
 
+        CrossCompileFlags = {
+                'x64' : 'ARCH_FLAGS=-m64',
+                'x86' : 'ARCH_FLAGS=-m32',
+        }
+
         def __init__(self, arch):
+                try:
+                        canonical_host = Architecture.makeCanonical( config.HOSTARCH )
+                except KeyError:
+                        print("Unkown host architecture %s" % config.HOSTARCH, file=sys.stderr)
+                        sys.exit(1)
+
                 if arch:
+                        try:
+                                arch = Architecture.makeCanonical( arch )
+                        except KeyError:
+                                print("Unkown architecture %s" % arch, file=sys.stderr)
+                                sys.exit(1)
+
+                if arch and arch != canonical_host:
+                        self.target = arch
                         self.cross_compile = True
-                        try:
-                                self.target = Architecture.makeCanonical( arch )
+                        try :
+                                self.flags = Architecture.CrossCompileFlags[arch]
                         except KeyError:
-                                print("Unkown architecture %s" % arch)
+                                print("Cross compilation not available for architecture %s" % arch, file=sys.stderr)
                                 sys.exit(1)
+
                 else:
+                        self.target = canonical_host
                         self.cross_compile = False
-                        try:
-                                arch = config.HOSTARCH
-                                self.target = Architecture.makeCanonical( arch )
-                        except KeyError:
-                                print("Running on unkown architecture %s" % arch)
-                                sys.exit(1)
+                        self.flags = ""
 
                 self.string = self.target
@@ -65 +81 @@
         def __init__(self, value):
                 self.string = "debug" if value else "no debug"
-                self.flags  = """DEBUG_FLAGS="%s" """ % ("-debug" if value else "-nodebug")
+                self.flags  = """DEBUG_FLAGS="%s" """ % ("-debug -O0" if value else "-nodebug -O2")
 
 class Install:
@@ -98 +114 @@
                 with open (".validate.err", "r") as myfile:
                         error=myfile.read()
-                print('ERROR: Invalid configuration', file=sys.stderr)
+                print("ERROR: Invalid configuration %s:%s" % (arch.string, debug.string), file=sys.stderr)
                 print("       verify returned : \n%s" % error, file=sys.stderr)
                 tools.rm("%s/.validate.err" % BUILDDIR)