You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/02/02 01:55:49 UTC

[GitHub] ccollins476ad closed pull request #131: MYNEWT-882 Newt - Allow spaces in paths

ccollins476ad closed pull request #131: MYNEWT-882 Newt - Allow spaces in paths
URL: https://github.com/apache/mynewt-newt/pull/131
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/newt/toolchain/compiler.go b/newt/toolchain/compiler.go
index cc19968b..c2e1daab 100644
--- a/newt/toolchain/compiler.go
+++ b/newt/toolchain/compiler.go
@@ -347,7 +347,8 @@ func (c *Compiler) includesStrings() []string {
 		return nil
 	}
 
-	includes := util.SortFields(c.info.Includes...)
+	includes := util.UniqueStrings(c.info.Includes)
+	sort.Strings(includes)
 
 	tokens := make([]string, len(includes))
 	for i, s := range includes {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services