diff options
| -rw-r--r-- | xmake/core/tool/compiler.lua | 6 | ||||
| -rw-r--r-- | xmake/core/tool/linker.lua | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmake/core/tool/compiler.lua b/xmake/core/tool/compiler.lua index e78710a8d..ff8ce6a5d 100644 --- a/xmake/core/tool/compiler.lua +++ b/xmake/core/tool/compiler.lua @@ -339,9 +339,6 @@ function compiler:compflags(opt) self:_add_flags_from_compiler(flags, targetkind) self:_add_flags_from_toolchains(flags, targetkind, target) - -- add flags from user configuration - self:_add_flags_from_config(flags) - -- add flags from target self:_add_flags_from_target(flags, target) @@ -359,6 +356,9 @@ function compiler:compflags(opt) self:_add_flags_from_argument(flags, target, configs) end + -- add flags from user configuration + self:_add_flags_from_config(flags) + -- preprocess flags return self:_preprocess_flags(flags) end diff --git a/xmake/core/tool/linker.lua b/xmake/core/tool/linker.lua index c34f578df..443e10d43 100644 --- a/xmake/core/tool/linker.lua +++ b/xmake/core/tool/linker.lua @@ -277,9 +277,6 @@ function linker:linkflags(opt) self:_add_flags_from_linker(flags) self:_add_flags_from_toolchains(flags, targetkind, target) - -- add flags from user configuration - self:_add_flags_from_config(flags) - -- add flags from target self:_add_flags_from_target(flags, target) @@ -289,6 +286,9 @@ function linker:linkflags(opt) self:_add_flags_from_argument(flags, target, configs) end + -- add flags from user configuration + self:_add_flags_from_config(flags) + -- preprocess flags return self:_preprocess_flags(flags) end |