diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 2043a2be683..f98d2696acd 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-2c400e9b763fa77db734788d61b78c69ea2def30
+b0040f15c13bdba0f3db56220b896f91545384e6
diff --git a/common/scripts/gobuild.sh b/common/scripts/gobuild.sh
index 3732bcb038c..500aeee580a 100755
--- a/common/scripts/gobuild.sh
+++ b/common/scripts/gobuild.sh
@@ -49,7 +49,7 @@ GOBUILDFLAGS=${GOBUILDFLAGS:-""}
 IFS=' ' read -r -a GOBUILDFLAGS_ARRAY <<< "$GOBUILDFLAGS"
 
 GCFLAGS=${GCFLAGS:-}
-export CGO_ENABLED=0
+export CGO_ENABLED=${CGO_ENABLED:-0}
 
 if [[ "${STATIC}" !=  "1" ]];then
     LDFLAGS=""