Simplified system command

src/build/config/init.go

@@ -8,33 +8,39 @@ import (
 )
 
 var (
-	Executable string
-	Root       string
-	Library    string
+	Executable       string
+	Root             string
+	Library          string
+	WorkingDirectory string
 )
 
 func init() {
 	debug.SetGCPercent(-1)
-	executable, err := os.Executable()
+
+	var err error
+	Executable, err = os.Executable()
 
 	if err != nil {
 		panic(err)
 	}
 
-	Executable = executable
-	Root = filepath.Dir(executable)
+	WorkingDirectory, err = os.Getwd()
+
+	if err != nil {
+		panic(err)
+	}
+
+	Root = filepath.Dir(Executable)
 	Library = filepath.Join(Root, "lib")
 	stat, err := os.Stat(Library)
 
-	if !os.IsNotExist(err) && stat != nil && stat.IsDir() {
-		return
+	if os.IsNotExist(err) || stat == nil || !stat.IsDir() {
+		findLibrary()
 	}
+}
 
-	dir, err := os.Getwd()
-
-	if err != nil {
-		panic(err)
-	}
+func findLibrary() {
+	dir := WorkingDirectory
 
 	for {
 		Library = path.Join(dir, "lib")