From 78eb881a7067123226c72f3f932ffec0520a3231 Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Wed, 14 Sep 2022 16:18:40 -0700 Subject: [PATCH 1/2] Pass the early SwiftSyntax build directory down to build-script-impl. This gives LLDB's CMake build access to the build directory. --- .../swift_build_support/build_script_invocation.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py index f25c3a3071d03..7e1a34dfba6be 100644 --- a/utils/swift_build_support/swift_build_support/build_script_invocation.py +++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py @@ -251,6 +251,13 @@ def convert_to_impl_arguments(self): args.extra_cmake_options.append( '-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH={}'.format(swift_syntax_src)) + if args.build_early_swiftsyntax: + early_swiftsyntax_build_dir = os.path.join( + self.workspace.build_root, '%s-%s' % ('earlyswiftsyntax', + self.args.host_target)) + args.extra_cmake_options.append( + '-DSWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH={}'.format(early_swiftsyntax_build_dir)) + # Then add subproject install flags that either skip building them /or/ # if we are going to build them and install_all is set, we also install # them. From 4a38f03c19c1052f67ae6cca993e692c0010b931 Mon Sep 17 00:00:00 2001 From: Doug Gregor Date: Fri, 16 Sep 2022 16:06:03 -0700 Subject: [PATCH 2/2] Fix Python lint warnings --- .../swift_build_support/build_script_invocation.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py index 7e1a34dfba6be..39cc3232b1f42 100644 --- a/utils/swift_build_support/swift_build_support/build_script_invocation.py +++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py @@ -253,10 +253,11 @@ def convert_to_impl_arguments(self): if args.build_early_swiftsyntax: early_swiftsyntax_build_dir = os.path.join( - self.workspace.build_root, '%s-%s' % ('earlyswiftsyntax', - self.args.host_target)) + self.workspace.build_root, + '%s-%s' % ('earlyswiftsyntax', self.args.host_target)) args.extra_cmake_options.append( - '-DSWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH={}'.format(early_swiftsyntax_build_dir)) + '-DSWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH={}' + .format(early_swiftsyntax_build_dir)) # Then add subproject install flags that either skip building them /or/ # if we are going to build them and install_all is set, we also install