aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-20 09:47:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-21 22:43:04 +0000
commitc46faa132d39d3dc235a019d9abf6e46f74e3bae (patch)
tree2579e210f0c282f6daed7507f8ced845b78ae94a /meta/recipes-devtools
parente23601390833fe93d58ca61a7158458dfdbd6fac (diff)
downloadopenembedded-core-contrib-c46faa132d39d3dc235a019d9abf6e46f74e3bae.tar.gz
go-native: Install bootstrap binaries with 1.4 suffix
Currently, bin/go and bin/gofmt collide between go-native and go-bootstrap-native packages, these are scripts anyway which call the go compiler proper from right install, in this case create go1.4 and gofmt1.4 names for these scripts to avoid namespace collision Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/go/go-native.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/go/go-native.inc b/meta/recipes-devtools/go/go-native.inc
index c1ada5121a..c21f8fda78 100644
--- a/meta/recipes-devtools/go/go-native.inc
+++ b/meta/recipes-devtools/go/go-native.inc
@@ -22,14 +22,14 @@ do_compile() {
}
make_wrapper() {
- rm -f ${D}${bindir}/$2
- cat <<END >${D}${bindir}/$2
+ rm -f ${D}${bindir}/$2$3
+ cat <<END >${D}${bindir}/$2$3
#!/bin/bash
here=\`dirname \$0\`
-export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go\`}"
-\$here/../lib/go/bin/$1 "\$@"
+export GOROOT="${GOROOT:-\`readlink -f \$here/../lib/go$3\`}"
+\$here/../lib/go$3/bin/$1 "\$@"
END
- chmod +x ${D}${bindir}/$2
+ chmod +x ${D}${bindir}/$2$3
}
do_install() {
@@ -45,7 +45,7 @@ do_install() {
do
base=`basename $f`
install -m755 $f ${D}${libdir}/go${BOOTSTRAP}/bin
- make_wrapper $base $base
+ make_wrapper $base $base ${BOOTSTRAP}
done
}