You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/10 22:38:51 UTC
[39/50] incubator-mynewt-newt git commit: newt - Fix some typos.
newt - Fix some typos.
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/eb6d0819
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/eb6d0819
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/eb6d0819
Branch: refs/heads/master
Commit: eb6d0819ea35f9e42bbd8f98b16a19203f74537b
Parents: c71f226
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Nov 8 13:25:25 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Nov 8 13:25:25 2016 -0800
----------------------------------------------------------------------
newt/builder/build.go | 2 +-
newt/builder/targetbuild.go | 2 +-
newt/toolchain/deps.go | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/eb6d0819/newt/builder/build.go
----------------------------------------------------------------------
diff --git a/newt/builder/build.go b/newt/builder/build.go
index 276a742..d5bc998 100644
--- a/newt/builder/build.go
+++ b/newt/builder/build.go
@@ -589,7 +589,7 @@ func (b *Builder) buildRomElf(common *symbol.SymbolMap) error {
}
}
- bld, err := d.RomElfBuldRequired(b.AppLinkerElfPath(),
+ bld, err := d.RomElfBuildRequired(b.AppLinkerElfPath(),
b.AppElfPath(), archNames)
if err != nil {
return err
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/eb6d0819/newt/builder/targetbuild.go
----------------------------------------------------------------------
diff --git a/newt/builder/targetbuild.go b/newt/builder/targetbuild.go
index e044b43..b3a5570 100644
--- a/newt/builder/targetbuild.go
+++ b/newt/builder/targetbuild.go
@@ -477,7 +477,7 @@ func (t *TargetBuilder) RelinkLoader() (error, map[string]bool,
if len(badpkgs) > 0 {
errStr := fmt.Sprintf(
- "Common packages with different implementaiton\n %s \n",
+ "Common packages with different implementation\n %s\n",
strings.Join(badpkgs, "\n "))
errStr += symbolStr
return util.NewNewtError(errStr), nil, nil
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/eb6d0819/newt/toolchain/deps.go
----------------------------------------------------------------------
diff --git a/newt/toolchain/deps.go b/newt/toolchain/deps.go
index aad0dd6..a0ab37c 100644
--- a/newt/toolchain/deps.go
+++ b/newt/toolchain/deps.go
@@ -385,11 +385,11 @@ func (tracker *DepTracker) LinkRequired(dstFile string,
/* Building a ROM elf is used for shared application linking.
* A ROM elf requires a rebuild if any of archives (.a files) are newer
* than the rom elf, or if the elf file is newer than the rom_elf */
-func (tracker *DepTracker) RomElfBuldRequired(dstFile string, elfFile string,
+func (tracker *DepTracker) RomElfBuildRequired(dstFile string, elfFile string,
archFiles []string) (bool, error) {
- // If the rom_elf file doesn't exist or is older than any input file, a rebuild
- // is required.
+ // If the rom_elf file doesn't exist or is older than any input file, a
+ // rebuild is required.
dstModTime, err := util.FileModificationTime(dstFile)
if err != nil {
return false, err