summaryrefslogtreecommitdiff
path: root/xmake/modules/private/action/build/object.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2019-09-06 00:43:05 +0800
committerruki <[email protected]>2019-09-05 22:18:30 +0800
commitcfb90668f507c9b93fa3e53f78f8f46cdb136413 (patch)
tree6517400be4e448ffce8c1c8d3ac6d0257ff817ad /xmake/modules/private/action/build/object.lua
parent5f3ad152caf5509dd6e8a8249872c8969be1d49f (diff)
add c++.build.modules
Diffstat (limited to 'xmake/modules/private/action/build/object.lua')
-rw-r--r--xmake/modules/private/action/build/object.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/private/action/build/object.lua b/xmake/modules/private/action/build/object.lua
index abfb3682b..7201185ff 100644
--- a/xmake/modules/private/action/build/object.lua
+++ b/xmake/modules/private/action/build/object.lua
@@ -38,7 +38,7 @@ function _do_build_file(target, sourcefile, opt)
local compinst = compiler.load(sourcekind, {target = target})
-- get compile flags
- local compflags = compinst:compflags({target = target, sourcefile = sourcefile})
+ local compflags = compinst:compflags({target = target, sourcefile = sourcefile, configs = opt.configs})
-- load dependent info
local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {})
@@ -97,7 +97,7 @@ function _build_object(target, sourcebatch, index, opt)
local progress_now = progress.start + ((index - 1) * (progress.stop - progress.start)) / #sourcebatch.sourcefiles
-- init build option
- local opt = {objectfile = objectfile, dependfile = dependfile, sourcekind = sourcekind, progress = progress_now}
+ local opt = {objectfile = objectfile, dependfile = dependfile, sourcekind = sourcekind, progress = progress_now, configs = opt.configs}
-- do before build
local before_build_file = target:script("build_file_before")