Changeset 261551 in webkit
- Timestamp:
- May 12, 2020 3:51:03 AM (4 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r261539 r261551 1 2020-05-12 Philippe Normand <pnormand@igalia.com> 2 3 [Flatpak SDK] Include clang++ and g++ in toolchains 4 https://bugs.webkit.org/show_bug.cgi?id=211663 5 6 Reviewed by Adrian Perez de Castro. 7 8 /usr/bin/clang++ wasn't included before. Also a small unrelated drive-by, white-list RUST 9 env vars, such as RUST_LOG, useful when debugging sccache. 10 11 * flatpak/flatpakutils.py: 12 (WebkitFlatpak.run_in_sandbox): 13 (WebkitFlatpak.main): 14 (WebkitFlatpak.setup_icecc): 15 1 16 2020-05-11 Simon Fraser <simon.fraser@apple.com> 2 17 -
trunk/Tools/flatpak/flatpakutils.py
r261294 r261551 717 717 "ICECC", 718 718 "JSC", 719 "RUST", 719 720 "SCCACHE", 720 721 "WAYLAND", … … 830 831 if regenerate_toolchains: 831 832 self.icc_version = {} 832 self.setup_icecc("gcc" )833 self.setup_icecc("clang" )833 self.setup_icecc("gcc", "g++") 834 self.setup_icecc("clang", "clang++") 834 835 self.save_config() 835 836 … … 853 854 json.dump(json_config, config) 854 855 855 def setup_icecc(self, name):856 def setup_icecc(self, *compilers): 856 857 with tempfile.NamedTemporaryFile() as tmpfile: 857 toolchain_path = "/usr/bin/%s" % name 858 self.run_in_sandbox('icecc', '--build-native', toolchain_path, stdout=tmpfile, cwd=self.source_root) 858 command = ['icecc', '--build-native'] 859 command.extend(["/usr/bin/%s" % compiler for compiler in compilers]) 860 self.run_in_sandbox(*command, stdout=tmpfile, cwd=self.source_root) 859 861 tmpfile.flush() 860 862 tmpfile.seek(0) … … 863 865 if not os.path.isdir(toolchains_directory): 864 866 os.makedirs(toolchains_directory) 865 archive_filename = os.path.join(toolchains_directory, "webkit-sdk-%s-%s" % ( name, icc_version_filename))867 archive_filename = os.path.join(toolchains_directory, "webkit-sdk-%s-%s" % (compilers[0], icc_version_filename)) 866 868 os.rename(icc_version_filename, archive_filename) 867 self.icc_version[ name] = archive_filename869 self.icc_version[compilers[0]] = archive_filename 868 870 Console.message("Created %s self-contained toolchain archive", archive_filename) 869 871
Note: See TracChangeset
for help on using the changeset viewer.