Skip to content

Commit 12b98ef

Browse files
committed
Fix debug optimization flag for Clang
1 parent 6f0cb4a commit 12b98ef

File tree

3 files changed

+47
-9
lines changed

3 files changed

+47
-9
lines changed

modules/codelite/tests/test_codelite_config.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
prepare()
6060
codelite.project.compiler(cfg)
6161
test.capture [[
62-
<Compiler Options="-O0;-fPIC;-g;-std=c++11;-fno-exceptions;-fno-stack-protector;-fno-rtti;-include forced_include1.h;-include forced_include2.h;-opt1;-opt2" C_Options="-O0;-fPIC;-g;-include forced_include1.h;-include forced_include2.h;-opt1;-opt2" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="1">
62+
<Compiler Options="-Og;-fPIC;-g;-std=c++11;-fno-exceptions;-fno-stack-protector;-fno-rtti;-include forced_include1.h;-include forced_include2.h;-opt1;-opt2" C_Options="-Og;-fPIC;-g;-include forced_include1.h;-include forced_include2.h;-opt1;-opt2" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="1">
6363
</Compiler>
6464
]]
6565
end

src/tools/clang.lua

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,7 @@
5050
},
5151
strictaliasing = gcc.shared.strictaliasing,
5252
openmp = gcc.shared.openmp,
53-
optimize = {
54-
Off = "-O0",
55-
On = "-O2",
56-
Debug = "-O0",
57-
Full = "-O3",
58-
Size = "-Os",
59-
Speed = "-O3",
60-
},
53+
optimize = gcc.shared.optimize,
6154
pic = gcc.shared.pic,
6255
vectorextensions = gcc.shared.vectorextensions,
6356
isaextensions = gcc.shared.isaextensions,

tests/tools/test_clang.lua

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,48 @@
152152
test.contains({ "-fsanitize=undefined" }, clang.getcflags(cfg))
153153
test.contains({ "-fsanitize=undefined" }, clang.getldflags(cfg))
154154
end
155+
156+
--
157+
-- Test the optimization flags.
158+
--
159+
function suite.onOptimizeDebug()
160+
optimize "Debug"
161+
prepare()
162+
test.contains("-Og", clang.getcflags(cfg))
163+
test.contains("-Og", clang.getcxxflags(cfg))
164+
end
165+
166+
function suite.onOptimizeSize()
167+
optimize "Size"
168+
prepare()
169+
test.contains("-Os", clang.getcflags(cfg))
170+
test.contains("-Os", clang.getcxxflags(cfg))
171+
end
172+
173+
function suite.onOptimizeSpeed()
174+
optimize "Speed"
175+
prepare()
176+
test.contains("-O3", clang.getcflags(cfg))
177+
test.contains("-O3", clang.getcxxflags(cfg))
178+
end
179+
180+
function suite.onOptimizeOff()
181+
optimize "Off"
182+
prepare()
183+
test.contains("-O0", clang.getcflags(cfg))
184+
test.contains("-O0", clang.getcxxflags(cfg))
185+
end
186+
187+
function suite.onOptimizeOn()
188+
optimize "On"
189+
prepare()
190+
test.contains("-O2", clang.getcflags(cfg))
191+
test.contains("-O2", clang.getcxxflags(cfg))
192+
end
193+
194+
function suite.onOptimizeFull()
195+
optimize "Full"
196+
prepare()
197+
test.contains("-O3", clang.getcflags(cfg))
198+
test.contains("-O3", clang.getcxxflags(cfg))
199+
end

0 commit comments

Comments
 (0)