Changeset bc73be3 in mainline for tools/autotool.py

Timestamp:

2019-06-27T08:51:20Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

cpp: merge and resolve conflicts

File:

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

tools/autotool.py

@@ -1 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright (c) 2010 Martin Decky
@@ -201 +201 @@
                 target = "arm-helenos"
 
+        if (config['PLATFORM'] == "arm64"):
+                platform = config['PLATFORM']
+                target = "aarch64-helenos"
+
         if (config['PLATFORM'] == "ia32"):
                 platform = config['PLATFORM']
@@ -633 +637 @@
 
                 # Platform-specific utilities
-                if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
+                if (config['BARCH'] in ('amd64', 'arm64', 'ia32', 'ppc32', 'sparc64')):
                         common['GENISOIMAGE'] = check_app_alternatives(["genisoimage", "mkisofs", "xorriso"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
                         if common['GENISOIMAGE'] == 'xorriso':