From b12523e1e9ce6655eb54960337be680cbc31108e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Sun, 3 May 2015 17:56:31 +0300 Subject: [PATCH] Use subpackage name as output, rename --in to --pkg --- docker/base/Dockerfile | 2 +- xgo.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 39b2748..e9fd6fd 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -125,7 +125,7 @@ RUN \ echo ' fi' >> $BUILD && \ echo 'fi' >> $BUILD && \ echo >> $BUILD && \ - echo 'NAME=`basename $1`' >> $BUILD && \ + echo 'NAME=`basename $1/$PACK`' >> $BUILD && \ echo 'if [ "$OUT" != "" ]; then' >> $BUILD && \ echo ' NAME=$OUT' >> $BUILD && \ echo 'fi' >> $BUILD && \ diff --git a/xgo.go b/xgo.go index 0ccbda4..99a70f3 100644 --- a/xgo.go +++ b/xgo.go @@ -21,7 +21,7 @@ var dockerDist = "karalabe/xgo-" // Command line arguments to fine tune the compilation var goVersion = flag.String("go", "latest", "Go release to use for cross compilation") -var inPackage = flag.String("in", "", "Sub-package to build if not root import") +var inPackage = flag.String("pkg", "", "Sub-package to build if not root import") var outPrefix = flag.String("out", "", "Prefix to use for output naming (empty = package name)") var srcBranch = flag.String("branch", "", "Version control branch to build") var crossDeps = flag.String("deps", "", "CGO dependencies (configure/make based archives)")