Merge pull request #98 from dpiddy/go15-linker-x-equals

use new linker -X option format for go1.5
heroku · Oct 6, 2015 · a0a82e1 · a0a82e1
2 parents 5309522 + 2fd7784
commit a0a82e1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/bin/compile b/bin/compile
@@ -204,7 +204,15 @@ fi
 FLAGS=(-tags heroku)
 if [ -n "$GO_LINKER_SYMBOL" -a -n "$GO_LINKER_VALUE" ]
 then
-  FLAGS=(${FLAGS[@]} -ldflags "-X $GO_LINKER_SYMBOL $GO_LINKER_VALUE")
+  case $ver in
+  go1.5*)
+    xval="$GO_LINKER_SYMBOL=$GO_LINKER_VALUE"
+    ;;
+  *)
+    xval="$GO_LINKER_SYMBOL $GO_LINKER_VALUE"
+    ;;
+  esac
+  FLAGS=(${FLAGS[@]} -ldflags "-X $xval")
 fi
 
 unset GIT_DIR # unset git dir or it will mess with goinstall