[Lldb-commits] [lldb] 52e758f - [lldb] Fix build error in TestSimulatorPlatform.py

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-08-21T13:35:26-07:00
New Revision: 52e758f352e6fc7c2458e92cc0b6351bf9469628

URL: https://github.com/llvm/llvm-project/commit/52e758f352e6fc7c2458e92cc0b6351bf9469628
DIFF: https://github.com/llvm/llvm-project/commit/52e758f352e6fc7c2458e92cc0b6351bf9469628.diff

LOG: [lldb] Fix build error in TestSimulatorPlatform.py

Before e5d08fcbac72 the Makefile would always compute the min-version,
even if it wasn't set in the triple. This nuance got lost when passing
the ARCH_CFLAGS directly from TestSimulatorPlatform.

Added: 
    

Modified: 
    lldb/test/API/macosx/simulator/TestSimulatorPlatform.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
index 7be192491251..0262f5af5004 100644
--- a/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
+++ b/lldb/test/API/macosx/simulator/TestSimulatorPlatform.py
@@ -46,15 +46,16 @@ def check_debugserver(self, log, expected_platform, expected_version):
     def run_with(self, arch, os, vers, env, expected_load_command):
         env_list = [env] if env else []
         triple = '-'.join([arch, 'apple', os + vers] + env_list)
+        sdk = lldbutil.get_xcode_sdk(os, env)
 
         version_min = ''
-        if vers:
-            if env == 'simulator':
-                version_min = '-m{}-simulator-version-min={}'.format(os, vers)
-            elif os == 'macosx':
-                version_min = '-m{}-version-min={}'.format(os, vers)
+        if not vers:
+            vers = lldbutil.get_xcode_sdk_version(sdk)
+        if env == 'simulator':
+            version_min = '-m{}-simulator-version-min={}'.format(os, vers)
+        elif os == 'macosx':
+            version_min = '-m{}-version-min={}'.format(os, vers)
 
-        sdk = lldbutil.get_xcode_sdk(os, env)
         sdk_root = lldbutil.get_xcode_sdk_root(sdk)
 
         self.build(