Skip to content

Commit c9fe3ad

Browse files
[tool] remove output/**/debug file generation
1 parent bedd532 commit c9fe3ad

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

tools/generate.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,10 @@ while read comp ; do
106106
gencompopt 2 warnings $warn_opts
107107
gencompopt 2 warnings_with_conversions $warn_opts conversion_warnings
108108
gencompopt 2 suggestions suggest_attributes=common
109-
gencompopt 2 debug symbols=debug
110-
gencompopt 2 sanitizers sanitizers
109+
gencompopt 2 sanitizers symbols=debug sanitizers
111110
# C++ only
112-
gencompopt 1 stl_debug stl_hardening=debug
113-
gencompopt 1 stl_debug_broken_abi stl_hardening=debug_with_broken_abi
111+
gencompopt 1 stl_debug symbols=debug stl_hardening=debug
112+
gencompopt 1 stl_debug_broken_abi symbols=debug stl_hardening=debug_with_broken_abi
114113
gencompopt 1 sanitizers-pointer other_sanitizers=pointer
115114
gencompopt 1 template_tree diagnostics_show_template=tree_without_elided_types
116115
done < <($LUA ./compiler-options.lua generators/compiler.lua)

tools/merge_generated.lua

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,14 @@ local function remove_file(path)
9191
end
9292

9393
local function create_debug_file(prefix, files_contents)
94-
local lines = tokeys(
95-
split_lines(files_contents['debug'],
96-
split_lines(files_contents['sanitizers'])))
94+
local sanitizers = tokeys(split_lines(files_contents['sanitizers']))
9795

9896
-- debug_full file
99-
local debug_full = tokeys(split_lines(files_contents['stl_debug']), tokeys(lines))
97+
local debug_full = tokeys(split_lines(files_contents['stl_debug']), tokeys(sanitizers))
10098
write_ktable(debug_full, prefix .. 'debug_full')
10199

102100
-- debug_full_broken_abi file
103-
local debug_full_broken_abi = tokeys(split_lines(files_contents['stl_debug_broken_abi']), lines)
101+
local debug_full_broken_abi = tokeys(split_lines(files_contents['stl_debug_broken_abi']), sanitizers)
104102
write_ktable(debug_full_broken_abi, prefix .. 'debug_full_broken_abi')
105103
end
106104

0 commit comments

Comments
 (0)