Skip to content

Commit 52e758f

Browse files
committed
[lldb] Fix build error in TestSimulatorPlatform.py
Before e5d08fc 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.
1 parent e21a22a commit 52e758f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,16 @@ def check_debugserver(self, log, expected_platform, expected_version):
4646
def run_with(self, arch, os, vers, env, expected_load_command):
4747
env_list = [env] if env else []
4848
triple = '-'.join([arch, 'apple', os + vers] + env_list)
49+
sdk = lldbutil.get_xcode_sdk(os, env)
4950

5051
version_min = ''
51-
if vers:
52-
if env == 'simulator':
53-
version_min = '-m{}-simulator-version-min={}'.format(os, vers)
54-
elif os == 'macosx':
55-
version_min = '-m{}-version-min={}'.format(os, vers)
52+
if not vers:
53+
vers = lldbutil.get_xcode_sdk_version(sdk)
54+
if env == 'simulator':
55+
version_min = '-m{}-simulator-version-min={}'.format(os, vers)
56+
elif os == 'macosx':
57+
version_min = '-m{}-version-min={}'.format(os, vers)
5658

57-
sdk = lldbutil.get_xcode_sdk(os, env)
5859
sdk_root = lldbutil.get_xcode_sdk_root(sdk)
5960

6061
self.build(

0 commit comments

Comments
 (0)