mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [17/50] incubator-mynewt-newt git commit: Rename target var "compiler_def" to "build_profile.
Date Wed, 09 Mar 2016 20:23:32 GMT
Rename target var "compiler_def" to "build_profile.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/690cb84f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/690cb84f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/690cb84f

Branch: refs/heads/develop
Commit: 690cb84f3afc481b5caad5e66d188f9251db9d7c
Parents: 9446bbc
Author: Christopher Collins <ccollins476ad@gmail.com>
Authored: Tue Mar 8 14:32:45 2016 -0800
Committer: Christopher Collins <ccollins476ad@gmail.com>
Committed: Tue Mar 8 14:32:45 2016 -0800

----------------------------------------------------------------------
 newt/toolchain/compiler.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/690cb84f/newt/toolchain/compiler.go
----------------------------------------------------------------------
diff --git a/newt/toolchain/compiler.go b/newt/toolchain/compiler.go
index 21c2ef1..34c2e51 100644
--- a/newt/toolchain/compiler.go
+++ b/newt/toolchain/compiler.go
@@ -81,7 +81,7 @@ func (ci *CompilerInfo) AddCompilerInfo(newCi *CompilerInfo) {
 }
 
 func NewCompiler(compilerDir string, dstDir string,
-	cDef string) (*Compiler, error) {
+	buildProfile string) (*Compiler, error) {
 
 	c := &Compiler{
 		ObjPathList: map[string]bool{},
@@ -91,8 +91,8 @@ func NewCompiler(compilerDir string, dstDir string,
 	c.depTracker = NewDepTracker(c)
 
 	cli.StatusMessage(cli.VERBOSITY_VERBOSE,
-		"Loading compiler %s, def %s\n", compilerDir, cDef)
-	err := c.load(compilerDir, cDef)
+		"Loading compiler %s, def %s\n", compilerDir, buildProfile)
+	err := c.load(compilerDir, buildProfile)
 	if err != nil {
 		return nil, err
 	}
@@ -100,7 +100,7 @@ func NewCompiler(compilerDir string, dstDir string,
 	return c, nil
 }
 
-func (c *Compiler) load(compilerDir string, cDef string) error {
+func (c *Compiler) load(compilerDir string, buildProfile string) error {
 	v, err := util.ReadConfig(compilerDir, "compiler")
 	if err != nil {
 		return err
@@ -113,7 +113,7 @@ func (c *Compiler) load(compilerDir string, cDef string) error {
 	c.osPath = v.GetString("compiler.path.objsize")
 	c.ocPath = v.GetString("compiler.path.objcopy")
 
-	cflags := v.GetStringSlice("compiler.flags." + cDef)
+	cflags := v.GetStringSlice("compiler.flags." + buildProfile)
 	for _, flag := range cflags {
 		if strings.HasPrefix(flag, "compiler.flags") {
 			c.info.Cflags = append(c.info.Cflags,


Mime
View raw message