From c46faa132d39d3dc235a019d9abf6e46f74e3bae Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 20 Mar 2017 09:47:35 -0700 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-devtools/go/go-native.inc | 12 ++++++------ 1 file 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 <${D}${bindir}/$2 + rm -f ${D}${bindir}/$2$3 + cat <${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 } -- cgit 1.2.3-korg