Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "make.go: do not make a genfileembed.exe when cross-compiling"

This commit is contained in:
Mathieu Lonjaret 2015-08-19 16:24:04 +00:00 committed by Gerrit Code Review
parent 4d5cfb81c7 20659d45f0
commit 9a42ac9b91
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make.go
View File

@ -395,7 +395,12 @@ func buildSrcPath(fromSrc string) string {
// It also populates wantDestFile with those files so they're
// kept in between runs.
func genEmbeds() error {
cmdName := exeName(filepath.Join(buildGoPath, "bin", "genfileembed"))
// Note: do not use exeName for genfileembed, as it will run on the current platform,
// not on the one we're cross-compiling for.
cmdName := filepath.Join(buildGoPath, "bin", "genfileembed")
if runtime.GOOS == "windows" {
cmdName += ".exe"
}
for _, embeds := range []string{"server/camlistored/ui", "pkg/server", "third_party/react", "third_party/less", "third_party/glitch", "third_party/fontawesome", "app/publisher"} {
embeds := buildSrcPath(embeds)
args := []string{"--output-files-stderr", embeds}