diff options
| author | ruki <[email protected]> | 2015-12-04 18:36:02 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-12-04 18:36:02 +0800 |
| commit | 55c9ce5e25f0b7a41c5b3d58436f3621f817f599 (patch) | |
| tree | 9373120bea9c7429f1a7ff6508bec7fba6c3811c /xmake/scripts/base/compiler.lua | |
| parent | a00d70829b2bdecc295d800c5402e96b9f538264 (diff) | |
modify flags order for compiler and linker
Diffstat (limited to 'xmake/scripts/base/compiler.lua')
| -rw-r--r-- | xmake/scripts/base/compiler.lua | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xmake/scripts/base/compiler.lua b/xmake/scripts/base/compiler.lua index 5fa96b93e..184ad0125 100644 --- a/xmake/scripts/base/compiler.lua +++ b/xmake/scripts/base/compiler.lua @@ -361,14 +361,14 @@ function compiler._make_for_option(module, opt, srcfile, objfile, logfile) local flags = {} compiler._addflags_from_compiler(module, flags, flagnames) - -- add flags from the platform - compiler._addflags_from_platform(module, flags, flagnames) + -- add flags from the configure + compiler._addflags_from_config(module, flags, flagnames) -- add flags from the option compiler._addflags_from_option(module, flags, flagnames, opt) - -- add flags from the configure - compiler._addflags_from_config(module, flags, flagnames) + -- add flags from the platform + compiler._addflags_from_platform(module, flags, flagnames) -- execute the compile command return module:command_compile(srcfile, objfile, table.concat(flags, " "):trim(), logfile) @@ -416,14 +416,14 @@ function compiler.make(module, target, srcfile, objfile, logfile) local flags = {} compiler._addflags_from_compiler(module, flags, flagnames) - -- add flags from the platform - compiler._addflags_from_platform(module, flags, flagnames) + -- add flags from the configure + compiler._addflags_from_config(module, flags, flagnames) -- add flags from the target compiler._addflags_from_target(module, flags, flagnames, target) - -- add flags from the configure - compiler._addflags_from_config(module, flags, flagnames) + -- add flags from the platform + compiler._addflags_from_platform(module, flags, flagnames) -- make the compile command return module:command_compile(srcfile, objfile, table.concat(flags, " "):trim(), logfile) |