Fix build errors when building with logrus

cmd/spicy/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	flag "github.com/ogier/pflag"
+	log "github.com/sirupsen/logrus"
 	"github.com/trhodeos/n64rom"
 	"github.com/trhodeos/spicy"
 	"io/ioutil"
@@ -85,6 +86,11 @@ func main() {
 	flag.VarP(&includeFlags, "include", "I", includes_text)
 	flag.VarP(&undefineFlags, "undefine", "U", undefine_text)
 	flag.Parse()
+	if *verbose {
+		log.SetLevel(log.DebugLevel)
+	} else {
+		log.SetLevel(log.WarnLevel)
+	}
 	f, err := os.Open(flag.Arg(0))
 	if err != nil {
 		panic(err)

cmds.go

@@ -2,15 +2,12 @@ package spicy
 
 import (
 	"bytes"
-	"fmt"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"io"
 	"os/exec"
 	"strings"
 )
 
-var log = logrus.New()
-
 func RunCmd(command string, args ...string) error {
 	log.Infof("About to run %s %s\n", command, strings.Join(args, " "))
 	cmd := exec.Command(command, args...)

entry_source.go

@@ -2,15 +2,13 @@ package spicy
 
 import (
 	"bytes"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"text/template"
 )
 
-var log = logrus.New()
-
 func createEntrySource(bootSegment *Segment) (string, error) {
 	t := `
 	.text

ld.go

@@ -3,15 +3,13 @@ package spicy
 import (
 	"bytes"
 	"fmt"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"text/template"
 )
 
-var log = logrus.New()
-
 func createLdScript(w *Wave) (string, error) {
 	t := `
 ENTRY(_start)