AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix codelite module test failure

Browse Source 
- Align clang cflags and cxxflags with gcc
This commit is contained in:
Michael Schwarcz 2016-11-14 17:04:10 +02:00
parent 0360b83669
commit 8d9fee6941
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/codelite/codelite_project.lua
View File

@ -196,7 +196,7 @@
end
local toolset = m.getcompiler(cfg)
local cxxflags = table.concat(table.join(toolset.getcflags(cfg), toolset.getcxxflags(cfg), cfg.buildoptions), ";")
local cxxflags = table.concat(table.join(toolset.getcxxflags(cfg), cfg.buildoptions), ";")
local cflags = table.concat(table.join(toolset.getcflags(cfg), cfg.buildoptions), ";")
local asmflags = ""
local pch = ""

32
src/tools/clang.lua
View File

@ -41,11 +41,11 @@
-- An array of C compiler flags.
--
clang.cflags = {
architecture = gcc.cflags.architecture,
flags = gcc.cflags.flags,
floatingpoint = gcc.cflags.floatingpoint,
strictaliasing = gcc.cflags.strictaliasing,
clang.shared = {
architecture = gcc.shared.architecture,
flags = gcc.shared.flags,
floatingpoint = gcc.shared.floatingpoint,
strictaliasing = gcc.shared.strictaliasing,
optimize = {
Off = "-O0",
On = "-O2",
@ -54,18 +54,21 @@
Size = "-Os",
Speed = "-O3",
},
pic = gcc.cflags.pic,
vectorextensions = gcc.cflags.vectorextensions,
warnings = gcc.cflags.warnings,
symbols = gcc.cflags.symbols
pic = gcc.shared.pic,
vectorextensions = gcc.shared.vectorextensions,
warnings = gcc.shared.warnings,
symbols = gcc.shared.symbols
}
function clang.getcflags(cfg)
local shared_flags = config.mapFlags(cfg, clang.shared)
local flags = config.mapFlags(cfg, clang.cflags)
-- Just pass through to GCC for now
local cflags = config.mapFlags(cfg, gcc.cflags)
local flags = table.join(shared_flags, cflags)
flags = table.join(flags, clang.getwarnings(cfg))
return flags
end
function clang.getwarnings(cfg)
@ -88,11 +91,14 @@
--
function clang.getcxxflags(cfg)
local shared_flags = config.mapFlags(cfg, clang.shared)
-- Just pass through to GCC for now
local flags = gcc.getcxxflags(cfg)
return flags
local cxxflags = config.mapFlags(cfg, gcc.cxxflags)
local flags = table.join(shared_flags, cxxflags)
flags = table.join(flags, clang.getwarnings(cfg))
return flags
end