@@ -506,8 +506,7 @@ install-destdir=%(install_destdir)s
506
506
# Path to the .tar.gz package we would create.
507
507
installable-package =%(installable_package)s
508
508
509
- # This preset builds foundation
510
- [preset: buildbot_linux_1510]
509
+ [preset: buildbot_linux]
511
510
mixin-preset =mixin_linux_installation
512
511
build-subdir =buildbot_linux
513
512
lldb
@@ -521,20 +520,13 @@ dash-dash
521
520
install-foundation
522
521
reconfigure
523
522
524
- # This preset does not build Foundation due to unavailable ICU versions on Ubuntu 14.04
525
- [preset: buildbot_linux_1404]
526
- mixin-preset =mixin_linux_installation
527
- build-subdir =buildbot_linux
528
- lldb
529
- release
530
- test
531
- validation-test
532
- foundation
533
-
534
- dash-dash
523
+ # Ubuntu 15.10 preset for backwards compat and future customizations.
524
+ [preset: buildbot_linux_1510]
525
+ mixin-preset =buildbot_linux
535
526
536
- install-foundation
537
- reconfigure
527
+ # Ubuntu 14.04 preset for backwards compat and future customizations.
528
+ [preset: buildbot_linux_1404]
529
+ mixin-preset =buildbot_linux
538
530
539
531
# ===------------------------------------------------------------------------===#
540
532
# OS X Package Builders
@@ -619,7 +611,7 @@ installable-package=%(installable_package)s
619
611
# Path to the .tar.gz symbols package
620
612
symbols-package =%(symbols_package)s
621
613
622
- # Info.plist
614
+ # Info.plist
623
615
darwin-toolchain-bundle-identifier =%(darwin_toolchain_bundle_identifier)s
624
616
darwin-toolchain-display-name =%(darwin_toolchain_display_name)s
625
617
darwin-toolchain-name =%(darwin_toolchain_xctoolchain_name)s
0 commit comments