Browse Source

trim gopath for cleaner stack trace

Darien Raymond 8 years ago
parent
commit
cadedeb26b
1 changed files with 10 additions and 1 deletions
  1. 10 1
      tools/build/go.go

+ 10 - 1
tools/build/go.go

@@ -8,13 +8,22 @@ import (
 )
 
 func buildV2Ray(targetFile string, version string, goOS GoOS, goArch GoArch) error {
+	goPath := os.Getenv("GOPATH")
 	ldFlags := "-s"
 	if version != "custom" {
 		year, month, day := time.Now().UTC().Date()
 		today := fmt.Sprintf("%04d%02d%02d", year, int(month), day)
 		ldFlags = ldFlags + " -X v2ray.com/core.version=" + version + " -X v2ray.com/core.build=" + today
 	}
-	cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "v2ray.com/core/main")
+	cmd := exec.Command(
+		"go", "build",
+		"-tags", "json",
+		"-o", targetFile,
+		"-compiler", "gc",
+		"-ldflags", ldFlags,
+		"-gcflags", "-trimpath="+goPath,
+		"-asmflags", "-trimpath="+goPath,
+		"v2ray.com/core/main")
 	cmd.Env = append(cmd.Env, "GOOS="+string(goOS), "GOARCH="+string(goArch), "CGO_ENABLED=0")
 	cmd.Env = append(cmd.Env, os.Environ()...)
 	output, err := cmd.CombinedOutput()