@@ -124,6 +124,8 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]:
124
124
'-Xcxx' , '-I' , '-Xcxx' ,
125
125
os .path .join (args .toolchain , 'lib' , 'swift' , 'Block' ),
126
126
]
127
+ if args .action == 'install' :
128
+ swiftpm_args += ['--disable-local-rpath' ]
127
129
128
130
if '-android' in build_target :
129
131
swiftpm_args += [
@@ -181,6 +183,9 @@ def get_swiftpm_environment_variables(swift_exec: str, args: argparse.Namespace)
181
183
if args .action == 'test' and args .skip_long_tests :
182
184
env ['SKIP_LONG_TESTS' ] = '1'
183
185
186
+ if args .action == 'install' :
187
+ env ['SOURCEKIT_LSP_CI_INSTALL' ] = "1"
188
+
184
189
return env
185
190
186
191
@@ -190,8 +195,6 @@ def build_single_product(product: str, swift_exec: str, args: argparse.Namespace
190
195
"""
191
196
swiftpm_args = get_swiftpm_options (swift_exec , args )
192
197
additional_env = get_swiftpm_environment_variables (swift_exec , args )
193
- if args .action == 'install' :
194
- additional_env ['SOURCEKIT_LSP_CI_INSTALL' ] = "1"
195
198
cmd = [swift_exec , 'build' , '--product' , product ] + swiftpm_args
196
199
check_call (cmd , additional_env = additional_env , verbose = args .verbose )
197
200
0 commit comments