compiler: Add compiler flags $(...) patterns #510
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
m-gorecki
force-pushed
the
flags-wildcards
branch
2 times, most recently
from
3253174
to
282ada3
Compare
andrzej-kaczmarek
requested changes
Feb 28, 2023
newt/toolchain/compiler.go
Outdated
|
|
||
| for i, flag := range c.lclInfo.Lflags { | ||
| if strings.Contains(flag, "$("+wildcard+")") { | ||
| c.lclInfo.Lflags[i] = strings.ReplaceAll(flag, "$("+wildcard+")", c.settings.Get(wildcard)) |
There was a problem hiding this comment.
would be better to match all $(...) in string and then replace each with corresponding syscfg value. this also allows to emit an error if referenced syscfg does not exist.
newt/toolchain/compiler.go
Outdated
| @@ -260,6 +291,7 @@ func NewCompiler(compilerDir string, dstDir string, | |||
| dstDir: dstDir, | |||
| extraDeps: []string{}, | |||
| compileCommands: []CompileCommand{}, | |||
| settings: cfg, | |||
There was a problem hiding this comment.
pass directly to load(), no need to store it if not used in other places
newt/toolchain/compiler.go
Outdated
| @@ -332,6 +364,10 @@ func (c *Compiler) load(compilerDir string, buildProfile string) error { | |||
| c.lclInfo.Lflags = loadFlags(yc, settings, "compiler.ld.flags") | |||
| c.lclInfo.Aflags = loadFlags(yc, settings, "compiler.as.flags") | |||
|
|
|||
| if c.settings != nil { | |||
| c.ReplaceWildcardFlags() | |||
There was a problem hiding this comment.
loadFlags() can handle it
m-gorecki
force-pushed
the
flags-wildcards
branch
from
282ada3
to
48a3b12
Compare
m-gorecki
changed the title
m-gorecki
force-pushed
the
flags-wildcards
branch
from
48a3b12
to
455cc4d
Compare
newt/toolchain/compiler.go
Outdated
| for i, flag := range flags { | ||
| for _, c := range cfg.Names() { | ||
| if strings.Contains(flag, "$("+c+")") && cfg.Exists(c) { | ||
| flags[i] = strings.ReplaceAll(flag, "$("+c+")", cfg.Get(c)) |
There was a problem hiding this comment.
no need to iterate all syscfg names to find matches, use ReplaceAllStringFunc instead
This adds the possibility to define and use $(...) patterns with compiler flags. To do so you have to define new value in compiler's syscfg.yml file, for example: EXAMPLE_FLAGS: value:"-my -compiler -flags" Expression "$(EXAMPLE_FLAGS)" used in any compiler flags definition in compiler.yml will be now replaced with the defined value (in this case whith "-my -compiler -flags"). It is also possible to override or add new patterns from other syscfg.yml files, for example from some application's syscfg.yml
m-gorecki
force-pushed
the
flags-wildcards
branch
from
455cc4d
to
496741f
Compare
sjanc
approved these changes
Apr 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds the possibility to define and use $(...) patterns with
compiler flags. To do so you have to define new value in compiler's syscfg.yml
file, for example:
EXAMPLE_FLAGS:
value:"-my -compiler -flags"
Expression "$(EXAMPLE_FLAGS)" used in any compiler flags definition in compiler.yml will
be now replaced with the defined value (in this case whith "-my -compiler -flags").
It is also possible to override or add new patterns from other syscfg.yml files, for example
from some application's syscfg.yml