Commit 5e2ed44b authored by Jérome Perrin's avatar Jérome Perrin

more gcc go removal

parent 52f3f40c
...@@ -49,7 +49,6 @@ promtail-bin = ${:bin}/promtail ...@@ -49,7 +49,6 @@ promtail-bin = ${:bin}/promtail
# use recent go # use recent go
golang = ${golang1.12:location} golang = ${golang1.12:location}
gcc-bin-directory = ${golang1.12:gcc-bin-directory}
[gowork.goinstall] [gowork.goinstall]
command = : command = :
...@@ -62,7 +61,8 @@ depends = ...@@ -62,7 +61,8 @@ depends =
[influxdb-install] [influxdb-install]
<= gowork.goinstall <= gowork.goinstall
command = bash -c ". ${gowork:env.sh} && \ command = bash -c "export PATH=${gcc-8.2:location}/bin:$PATH && \
. ${gowork:env.sh} && \
go install -v github.com/golang/dep/cmd/dep && \ go install -v github.com/golang/dep/cmd/dep && \
cd ${gowork:directory}/src/github.com/influxdata/influxdb && \ cd ${gowork:directory}/src/github.com/influxdata/influxdb && \
dep ensure && \ dep ensure && \
...@@ -71,7 +71,8 @@ update-command = ...@@ -71,7 +71,8 @@ update-command =
[telegraf-install] [telegraf-install]
<= gowork.goinstall <= gowork.goinstall
command = bash -c ". ${gowork:env.sh} && \ command = bash -c "export PATH=${gcc-8.2:location}/bin:$PATH && \
. ${gowork:env.sh} && \
go install -v github.com/golang/dep/cmd/dep && \ go install -v github.com/golang/dep/cmd/dep && \
cd ${gowork:directory}/src/github.com/influxdata/telegraf && \ cd ${gowork:directory}/src/github.com/influxdata/telegraf && \
${make:location}/bin/make && ${make:location}/bin/make &&
...@@ -81,7 +82,7 @@ update-command = ...@@ -81,7 +82,7 @@ update-command =
[grafana-install] [grafana-install]
<= gowork.goinstall <= gowork.goinstall
# yarn and go run build.go needs our nodejs in $PATH # yarn and go run build.go needs our nodejs in $PATH
command = bash -c "export PATH=${nodejs:location}/bin/:$PATH && \ command = bash -c "export PATH=${nodejs:location}/bin/:${gcc-8.2:location}/bin:$PATH && \
. ${gowork:env.sh} && \ . ${gowork:env.sh} && \
cd ${gowork:directory}/src/github.com/grafana/grafana && \ cd ${gowork:directory}/src/github.com/grafana/grafana && \
go run build.go setup && \ go run build.go setup && \
...@@ -93,7 +94,7 @@ update-command = ...@@ -93,7 +94,7 @@ update-command =
[loki-install] [loki-install]
<= gowork.goinstall <= gowork.goinstall
# loki also uses nodejs # loki also uses nodejs
command = bash -c "export PATH=${nodejs:location}/bin/:$PATH && \ command = bash -c "export PATH=${nodejs:location}/bin/:${gcc-8.2:location}/bin:$PATH && \
. ${gowork:env.sh} && \ . ${gowork:env.sh} && \
go install -v github.com/golang/dep/cmd/dep && \ go install -v github.com/golang/dep/cmd/dep && \
cd ${gowork:directory}/src/github.com/grafana/loki && \ cd ${gowork:directory}/src/github.com/grafana/loki && \
...@@ -103,7 +104,7 @@ update-command = ...@@ -103,7 +104,7 @@ update-command =
[promtail-install] [promtail-install]
<= gowork.goinstall <= gowork.goinstall
# CGO_ENABLED is to disable systemd support (did not compile in my case) # CGO_ENABLED is to disable systemd support (did not compile in my case)
command = bash -c "export CGO_ENABLED=0 && \ command = bash -c "export CGO_ENABLED=0 PATH=${gcc-8.2:location}/bin:$PATH && \
. ${gowork:env.sh} && \ . ${gowork:env.sh} && \
go install -v github.com/golang/dep/cmd/dep && \ go install -v github.com/golang/dep/cmd/dep && \
cd ${gowork:directory}/src/github.com/grafana/loki && \ cd ${gowork:directory}/src/github.com/grafana/loki && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment