diff options
| author | root <root@ip-10-122-10-221.ec2.internal> | 2022-09-28 21:20:56 +0000 |
|---|---|---|
| committer | root <root@ip-10-122-10-221.ec2.internal> | 2022-09-28 21:20:56 +0000 |
| commit | b8365f6d3d6637068f250f150a8eed482af293b6 (patch) | |
| tree | ef7550210e5fd0f036387ede8fe1d31a0c265a90 | |
| parent | 2a776d485811da606207eea8a5e2bf6b9ab70c01 (diff) | |
| download | mongo-b8365f6d3d6637068f250f150a8eed482af293b6.tar.gz | |
test passed on x86_64
| -rw-r--r-- | src/third_party/cares/platform/linux_x86_64/build/include/ares_config.h | 10 | ||||
| -rw-r--r-- | src/third_party/grpc/SConscript | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/third_party/cares/platform/linux_x86_64/build/include/ares_config.h b/src/third_party/cares/platform/linux_x86_64/build/include/ares_config.h index aee1b8ee53c..71b5654af97 100644 --- a/src/third_party/cares/platform/linux_x86_64/build/include/ares_config.h +++ b/src/third_party/cares/platform/linux_x86_64/build/include/ares_config.h @@ -276,7 +276,7 @@ /* #undef HAVE_STRNICMP */ /* Define to 1 if you have the <stropts.h> header file. */ -#define HAVE_STROPTS_H 1 +/* #undef HAVE_STROPTS_H */ /* Define to 1 if you have struct addrinfo. */ #define HAVE_STRUCT_ADDRINFO 1 @@ -341,7 +341,8 @@ /* Define if __system_property_get exists. */ /* #undef HAVE___SYSTEM_PROPERTY_GET */ -/* Define to the sub-directory where libtool stores uninstalled libraries. */ +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ #define LT_OBJDIR ".libs/" /* Define to 1 if you need the malloc.h header file even with stdlib.h */ @@ -356,8 +357,11 @@ /* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */ /* #undef NEED_THREAD_SAFE */ +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + /* cpu-machine-OS */ -#define OS "x86_64-pc-linux-gnu" +#define OS "x86_64-unknown-linux-gnu" /* Name of package */ #define PACKAGE "c-ares" diff --git a/src/third_party/grpc/SConscript b/src/third_party/grpc/SConscript index f3e6a42a54f..02def3553f9 100644 --- a/src/third_party/grpc/SConscript +++ b/src/third_party/grpc/SConscript @@ -54,7 +54,6 @@ upb_env.Library( "dist/third_party/upb/upb/text_encode.c", "dist/third_party/upb/upb/upb.c", "dist/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", - "dist/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c", "dist/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c", ], ) @@ -119,8 +118,8 @@ gpr_env = grpc_env.Clone() # older rhel7 platforms with older glibc give a warning `__warn_memset_zero_len` which # can not be selectively repressed, so we are disabling all warnings for this library. -if grpc_env['TARGET_ARCH'] in ['x86_64', 's390x', 'ppc64le']: - grpc_env.Append( +if gpr_env['TARGET_ARCH'] in ['x86_64', 's390x', 'ppc64le']: + gpr_env.Append( CCFLAGS=[ '-Wno-error', ], |