mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-25 17:48:39 +00:00
Trying to fix bazel on macOS and Xcode 14.3 (#8304)
* Fixes Bazel issues for windows and ci Fetching boringssl within the flatbuffers repository, to patch the issues of not being able to upgrade to Xcode 14.3 due to buildkite throwing errors. The patch was inspired by the tenserflow patch https://github.com/tensorflow/tensorflow/issues/60191#issuecomment-1496073147 Removes references of swift from the windows pipeline for bazel Sets github actions to use xcode 14.3 for kotlin and sets the macOS build for intel cpus. * Update build.yml Remove comment that is not relevant any longer. --------- Co-authored-by: Derek Bailey <derekbailey@google.com>
This commit is contained in:
@@ -11,3 +11,31 @@ index 1645a264a..12f8ca999 100644
|
||||
add_executable(
|
||||
bssl
|
||||
|
||||
diff --git a/src/crypto/x509/t_x509.c b/src/crypto/x509/t_x509.c
|
||||
index 7c32a8798..6e50d040e 100644
|
||||
--- a/src/crypto/x509/t_x509.c
|
||||
+++ b/src/crypto/x509/t_x509.c
|
||||
@@ -318,9 +318,7 @@ int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg,
|
||||
int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase)
|
||||
{
|
||||
char *s, *c, *b;
|
||||
- int ret = 0, l, i;
|
||||
-
|
||||
- l = 80 - 2 - obase;
|
||||
+ int ret = 0, i;
|
||||
|
||||
b = X509_NAME_oneline(name, NULL, 0);
|
||||
if (!b)
|
||||
@@ -347,12 +345,10 @@ int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase)
|
||||
if (BIO_write(bp, ", ", 2) != 2)
|
||||
goto err;
|
||||
}
|
||||
- l--;
|
||||
}
|
||||
if (*s == '\0')
|
||||
break;
|
||||
s++;
|
||||
- l--;
|
||||
}
|
||||
|
||||
ret = 1;
|
||||
|
||||
@@ -2,9 +2,12 @@ diff --git a/bazel/copts.bzl b/bazel/copts.bzl
|
||||
index 10be944f25..879518b92f 100644
|
||||
--- a/bazel/copts.bzl
|
||||
+++ b/bazel/copts.bzl
|
||||
@@ -59,4 +59,4 @@ GRPC_LLVM_WARNING_FLAGS = [
|
||||
@@ -59,4 +59,7 @@ GRPC_LLVM_WARNING_FLAGS = [
|
||||
GRPC_DEFAULT_COPTS = select({
|
||||
"//:use_strict_warning": GRPC_LLVM_WARNING_FLAGS + ["-DUSE_STRICT_WARNING=1"],
|
||||
"//conditions:default": [],
|
||||
-})
|
||||
+}) + ["-std=c++14"]
|
||||
+}) + select({
|
||||
+ "@bazel_tools//src/conditions:windows": ["/std:c++14"],
|
||||
+ "//conditions:default": ["-std=c++14"],
|
||||
+})
|
||||
|
||||
Reference in New Issue
Block a user