diff --git a/Golden_Repo/b/Bazel/Bazel-3.4.1-GCCcore-9.3.0.eb b/Golden_Repo/b/Bazel/Bazel-3.4.1-GCCcore-9.3.0.eb
index 9c56db60424b2505dbcf27e66037e818fe017af6..1ba88f7240e26c1e3293c14fd5be6f5be4d07683 100644
--- a/Golden_Repo/b/Bazel/Bazel-3.4.1-GCCcore-9.3.0.eb
+++ b/Golden_Repo/b/Bazel/Bazel-3.4.1-GCCcore-9.3.0.eb
@@ -11,11 +11,9 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
 
 source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s']
 sources = ['%(namelower)s-%(version)s-dist.zip']
+patches = ['%(name)s-%(version)s_fix_protobuf_libstdc.patch']
 
 builddependencies = [('binutils', '2.34')]
 dependencies = [('Java', '1.8', '', True)]
 
-prebuildopts = 'BAZEL_LINKOPTS="-static-libstdc++ -static-libgcc" '
-prebuildopts += 'BAZEL_LINKLIBS="-l%:libstdc++.a"'
-
 moduleclass = 'devel'
diff --git a/Golden_Repo/b/Bazel/Bazel-3.4.1_fix_protobuf_libstdc.patch b/Golden_Repo/b/Bazel/Bazel-3.4.1_fix_protobuf_libstdc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..05d72c491443d4b5d6a5984ef36535d3635732f7
--- /dev/null
+++ b/Golden_Repo/b/Bazel/Bazel-3.4.1_fix_protobuf_libstdc.patch
@@ -0,0 +1,10 @@
+--- third_party/grpc/bazel/generate_cc.bzl.orig	2020-08-04 14:19:51.304155177 +0200
++++ third_party/grpc/bazel/generate_cc.bzl	2020-08-04 14:20:08.316748158 +0200
+@@ -123,6 +123,7 @@
+         outputs = out_files,
+         executable = ctx.executable.protoc,
+         arguments = arguments,
++        use_default_shell_env = True,
+     )
+ 
+     return struct(files = depset(out_files))