Merge pull request swiftlang#130 from akyrtzi/build-script-block

akyrtzi · web-flow · commit 9591fdebd285 · 2019-08-04T16:33:09.000-07:00
[build-script-helper] Add a search path to be able to find `Block.h` from the just built toolchain
diff --git a/Utilities/build-script-helper.py b/Utilities/build-script-helper.py
@@ -38,6 +38,9 @@ def get_swiftpm_options(args):
       # Dispatch headers
       '-Xcxx', '-I', '-Xcxx',
       os.path.join(args.toolchain, 'usr', 'lib', 'swift'),
+      # For <Block.h>
+      '-Xcxx', '-I', '-Xcxx',
+      os.path.join(args.toolchain, 'usr', 'lib', 'swift', 'Block'),
     ]
 
   return swiftpm_args

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ def get_swiftpm_options(args):`
`38`	`38`	`# Dispatch headers`
`39`	`39`	`'-Xcxx', '-I', '-Xcxx',`
`40`	`40`	`os.path.join(args.toolchain, 'usr', 'lib', 'swift'),`
	`41`	`+ # For <Block.h>`
	`42`	`+ '-Xcxx', '-I', '-Xcxx',`
	`43`	`+ os.path.join(args.toolchain, 'usr', 'lib', 'swift', 'Block'),`
`41`	`44`	`]`
`42`	`45`
`43`	`46`	`return swiftpm_args`