golang: expose gcc-bin

component/golang/buildout.cfg

@@ -17,10 +17,12 @@ configure-command = :
 location = @@LOCATION@@
 make-binary =
 make-targets= cd src && ./all.bash && cp -alf .. ${:location}
+# gcc version to use
+gcc-bin-directory = ${gcc-8.2:location}/bin
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =
-  PATH=${gcc-8.2:location}/bin:%(PATH)s
+  PATH=${:gcc-bin-directory}:%(PATH)s
   GOROOT_FINAL=${:location}
   ${:environment-extra}
 
@@ -104,6 +106,9 @@ depends = ${gowork.goinstall:recipe}
 # go version used for the workspace (possible to override in applications)
 golang  = ${golang1.10:location}
 
+# gcc version must be compatible with go version selected
+gcc-bin-directory = ${golang1.10:gcc-bin-directory}
+
 # no special build flags by default
 buildflags =
 
@@ -123,7 +128,7 @@ recipe	= slapos.recipe.template
 url     = ${:_profile_base_location_}/goenv.sh.in
 output	= ${gowork:directory}/env.sh
 depends = ${gowork.mkdir:recipe}
-md5sum	= 7a067a3974c446c3eaa0e82818ba1adb
+md5sum	= 7eaad1f9aabd3cfad554975098c5d4c3
 
 [gowork.mkdir]
 # NOTE do not use slapos.cookbook:mkdirectory here - if anything in software (not instance)

component/golang/goenv.sh.in

@@ -3,7 +3,7 @@
 
 # ---- 8< ---- (buildout substitution here)
 # PATH so that go & friends work out of the box
-export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:$PATH
+export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gowork:gcc-bin-directory}:$PATH
 X=${gowork:directory}
 
 export PKG_CONFIG_PATH=$(echo -n "${gowork:cpkgpath}" |tr '\n' ':'):$PKG_CONFIG_PATH