Skip to content

Commit 0cd1fea

Browse files
authored
Merge pull request swiftlang#199 from ahoppen/verify-files-with-degyb-only
Verify the gyb-generated files even if --degyb-only is passed
2 parents 8655641 + da654e8 commit 0cd1fea

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

build-script.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,6 @@ def main():
639639
if not args.verify_generated_files:
640640
generate_gyb_files(args.gyb_exec, verbose=args.verbose,
641641
add_source_locations=args.add_source_locations)
642-
# Skip the rest of the build if we should perform degyb only
643-
if args.degyb_only:
644-
sys.exit(0)
645642
except subprocess.CalledProcessError as e:
646643
printerr('FAIL: Generating .gyb files failed')
647644
printerr('Executing: %s' % ' '.join(e.cmd))
@@ -658,6 +655,10 @@ def main():
658655
'gyb-files and recommit them.')
659656
sys.exit(1)
660657

658+
# Skip the rest of the build if we should perform degyb only
659+
if args.degyb_only:
660+
sys.exit(0)
661+
661662
if args.generate_xcodeproj:
662663
xcode_gen(config=args.xcconfig_path)
663664
sys.exit(0)

0 commit comments

Comments
 (0)