|
47 | 47 | <boringsslRepository>https://boringssl.googlesource.com/boringssl</boringsslRepository>
|
48 | 48 | <!-- Lets use what we use in netty-tcnative-boringssl-static -->
|
49 | 49 | <boringsslBranch>chromium-stable</boringsslBranch>
|
50 |
| - <boringsslCommitSha>ca1690e221677cea3fb946f324eb89d846ec53f2</boringsslCommitSha> |
| 50 | + <boringsslCommitSha>dd5219451c3ce26221762a15d867edf43b463bb2</boringsslCommitSha> |
51 | 51 |
|
52 | 52 | <quicheSourceDir>${project.build.directory}/quiche-source</quicheSourceDir>
|
53 | 53 | <quicheBuildDir>${quicheSourceDir}/target/release</quicheBuildDir>
|
|
116 | 116 | <!-- On *nix, add ASM flags to disable executable stack -->
|
117 | 117 | <cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
|
118 | 118 | <extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
|
119 |
| - <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags> |
| 119 | + <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags> |
120 | 120 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
|
121 |
| - <cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags> |
| 121 | + <cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags> |
122 | 122 | <libssl>libssl.a</libssl>
|
123 | 123 | <libcrypto>libcrypto.a</libcrypto>
|
124 | 124 | <libquiche>libquiche.a</libquiche>
|
|
139 | 139 | <!-- On *nix, add ASM flags to disable executable stack -->
|
140 | 140 | <cmakeAsmFlags>-Wa,--noexecstack -target arm64-apple-macos11</cmakeAsmFlags>
|
141 | 141 | <extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64</extraCmakeFlags>
|
142 |
| - <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags> |
| 142 | + <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags> |
143 | 143 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
|
144 |
| - <cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags> |
| 144 | + <cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags> |
145 | 145 | <libssl>libssl.a</libssl>
|
146 | 146 | <libcrypto>libcrypto.a</libcrypto>
|
147 | 147 | <libquiche>libquiche.a</libquiche>
|
|
169 | 169 | <!-- On *nix, add ASM flags to disable executable stack -->
|
170 | 170 | <cmakeAsmFlags>-Wa,--noexecstack -target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
|
171 | 171 | <extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64</extraCmakeFlags>
|
172 |
| - <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags> |
| 172 | + <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags> |
173 | 173 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
|
174 |
| - <cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags> |
| 174 | + <cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags> |
175 | 175 | <libssl>libssl.a</libssl>
|
176 | 176 | <libcrypto>libcrypto.a</libcrypto>
|
177 | 177 | <libquiche>libquiche.a</libquiche>
|
|
202 | 202 | <extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
|
203 | 203 | <!-- On *nix, add ASM flags to disable executable stack -->
|
204 | 204 | <cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
|
205 |
| - <cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags> |
| 205 | + <cmakeCFlags>${extraCflags}</cmakeCFlags> |
206 | 206 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
|
207 |
| - <cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags> |
| 207 | + <cmakeCxxFlags>${extraCxxflags} -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags> |
208 | 208 | <libssl>libssl.a</libssl>
|
209 | 209 | <libcrypto>libcrypto.a</libcrypto>
|
210 | 210 | <libquiche>libquiche.a</libquiche>
|
|
278 | 278 | <extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
|
279 | 279 | <!-- On *nix, add ASM flags to disable executable stack -->
|
280 | 280 | <cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
|
281 |
| - <cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags> |
| 281 | + <cmakeCFlags>${extraCflags}</cmakeCFlags> |
282 | 282 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
|
283 |
| - <cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags> |
| 283 | + <cmakeCxxFlags>${extraCxxflags} -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags> |
284 | 284 | <libssl>libssl.a</libssl>
|
285 | 285 | <libcrypto>libcrypto.a</libcrypto>
|
286 | 286 | <libquiche>libquiche.a</libquiche>
|
|
461 | 461 | <extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
|
462 | 462 | <!-- On *nix, add ASM flags to disable executable stack -->
|
463 | 463 | <cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
|
464 |
| - <cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags> |
| 464 | + <cmakeCFlags>${extraCflags}</cmakeCFlags> |
465 | 465 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
|
466 |
| - <cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags> |
| 466 | + <cmakeCxxFlags>${extraCxxflags} -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags> |
467 | 467 | <libssl>libssl.a</libssl>
|
468 | 468 | <libcrypto>libcrypto.a</libcrypto>
|
469 | 469 | <libquiche>libquiche.a</libquiche>
|
|
0 commit comments