Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions boringssl-static/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
<!-- We need to use the same module name for all our "native" impls as only one should be loaded -->
<javaModuleName>${javaDefaultModuleName}</javaModuleName>
<!-- 10.13 is the minimum required by BoringSSL -->
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=10.13</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13</cmakeOsxDeploymentTarget>
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
<project.artifactId>netty-tcnative-boringssl-static</project.artifactId>
</properties>

Expand Down Expand Up @@ -1325,8 +1325,8 @@
<linkStatic>true</linkStatic>
<crossCompile>mac</crossCompile>
<target>arm64-apple-macos11</target>
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11.0</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0</cmakeOsxDeploymentTarget>
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack -target ${target}</cmakeAsmFlags>
<cmakeCFlags>-O3 -fno-omit-frame-pointer -target ${target}</cmakeCFlags>
Expand Down Expand Up @@ -1573,8 +1573,8 @@
<linkStatic>true</linkStatic>
<crossCompile>mac</crossCompile>
<target>x86_64-apple-macos10.12</target>
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=10.12</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12</cmakeOsxDeploymentTarget>
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack -target ${target}</cmakeAsmFlags>
<cmakeCFlags>-O3 -fno-omit-frame-pointer -target ${target}</cmakeCFlags>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@
<strip.skip>false</strip.skip>
<muslCheck.skip>false</muslCheck.skip>
<generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir>
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=10.9</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9</cmakeOsxDeploymentTarget>
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
<jniArch>${os.detected.arch}</jniArch>
<jniClassifier>${os.detected.name}-${os.detected.arch}</jniClassifier>
<skipJapicmp>false</skipJapicmp>
Expand Down
Loading