Skip to content
Snippets Groups Projects
Commit 8225b426 authored by Alexandre Strube's avatar Alexandre Strube
Browse files

Removing the special config options, and adding the patch from Flamefire from here:

parent 5dfd937c
No related branches found
No related tags found
No related merge requests found
...@@ -11,11 +11,9 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'} ...@@ -11,11 +11,9 @@ toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s'] source_urls = ['https://github.com/bazelbuild/bazel/releases/download/%(version)s']
sources = ['%(namelower)s-%(version)s-dist.zip'] sources = ['%(namelower)s-%(version)s-dist.zip']
patches = ['%(name)s-%(version)s_fix_protobuf_libstdc.patch']
builddependencies = [('binutils', '2.34')] builddependencies = [('binutils', '2.34')]
dependencies = [('Java', '1.8', '', True)] dependencies = [('Java', '1.8', '', True)]
prebuildopts = 'BAZEL_LINKOPTS="-static-libstdc++ -static-libgcc" '
prebuildopts += 'BAZEL_LINKLIBS="-l%:libstdc++.a"'
moduleclass = 'devel' moduleclass = 'devel'
--- 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))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment