mirror of https://github.com/perkeep/perkeep.git
Mark FUSE & pkg/fs files as Linux & Mac only, to fix FreeBSD build.
Also start of cross-compiling support in make.go. Change-Id: Ic11ca2d433f135b07b3f6d7738eec9fe98590905
This commit is contained in:
parent
be8232ae4b
commit
dde968e763
22
make.go
22
make.go
|
@ -49,6 +49,7 @@ var (
|
|||
targets = flag.String("targets", "", "Optional comma-separated list of targets (i.e go packages) to build and install. Empty means all. Example: camlistore.org/server/camlistored,camlistore.org/cmd/camput")
|
||||
quiet = flag.Bool("quiet", false, "Don't print anything unless there's a failure.")
|
||||
ifModsSince = flag.Int64("if_mods_since", 0, "If non-zero return immediately without building if there aren't any filesystem modifications past this time (in unix seconds)")
|
||||
buildOS = flag.String("os", runtime.GOOS, "Operating system to build for.")
|
||||
)
|
||||
|
||||
var (
|
||||
|
@ -70,6 +71,18 @@ func main() {
|
|||
}
|
||||
verifyCamlistoreRoot(camRoot)
|
||||
|
||||
if runtime.GOOS != *buildOS {
|
||||
if *wantSQLite {
|
||||
log.Fatalf("SQLite isn't available when cross-compiling to another OS. Set --sqlite=false.")
|
||||
}
|
||||
// TODO(bradfitz): we can fix this one, though, by
|
||||
// building genfileembed with the GOOS of the host
|
||||
// instead:
|
||||
if *embedResources {
|
||||
log.Fatalf("Due to a bug, can't currently cross-compile and also embed resources. For now, set --embed_static=false")
|
||||
}
|
||||
}
|
||||
|
||||
sql := *wantSQLite && haveSQLite()
|
||||
|
||||
buildBaseDir := "build-gopath"
|
||||
|
@ -176,7 +189,7 @@ func main() {
|
|||
}
|
||||
args := append(baseArgs, targs...)
|
||||
if buildAll {
|
||||
switch runtime.GOOS {
|
||||
switch *buildOS {
|
||||
case "linux", "darwin":
|
||||
args = append(args, "camlistore.org/cmd/cammount")
|
||||
}
|
||||
|
@ -195,9 +208,7 @@ func main() {
|
|||
cmd.Stderr = os.Stderr
|
||||
}
|
||||
if *verbose {
|
||||
// TODO(reviewer) should this be cmd.Args too? Providing the contents
|
||||
// of baseArgs doesn't hurt when you're trying to debug.
|
||||
log.Printf("Running go install of main binaries with args %s", targs)
|
||||
log.Printf("Running go install of main binaries with args %s", cmd.Args)
|
||||
}
|
||||
if err := cmd.Run(); err != nil {
|
||||
log.Fatalf("Error building main binaries: %v\n%s", err, output.String())
|
||||
|
@ -242,6 +253,9 @@ func cleanGoEnv() (clean []string) {
|
|||
}
|
||||
clean = append(clean, env)
|
||||
}
|
||||
if *buildOS != runtime.GOOS {
|
||||
clean = append(clean, "GOOS="+*buildOS)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
/*
|
||||
Copyright 2011 Google Inc.
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
/*
|
||||
Copyright 2013 Google Inc.
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
/*
|
||||
Copyright 2012 Google Inc.
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
// Copyright 2011 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
// Copyright 2011 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
// Copyright 2012 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
// +build linux darwin
|
||||
|
||||
// Copyright 2012 The Go Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
|
Loading…
Reference in New Issue