Skip to content

Commit 6279e1c

Browse files
authored
Bump up macosxDeploymentTarget to 11 as lower is not supported anymore by latest macos release (#1012)
Motivation: We need to bump up the target to be able to compile on latest macos release Modifications: Use 11 Result: Be able to compile again
1 parent af25170 commit 6279e1c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎boringssl-static/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
<!-- We need to use the same module name for all our "native" impls as only one should be loaded -->
9898
<javaModuleName>${javaDefaultModuleName}</javaModuleName>
9999
<!-- 10.13 is the minimum required by BoringSSL -->
100-
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=10.13</macOsxDeploymentTarget>
101-
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13</cmakeOsxDeploymentTarget>
100+
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
101+
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
102102
<project.artifactId>netty-tcnative-boringssl-static</project.artifactId>
103103
</properties>
104104

@@ -1325,8 +1325,8 @@
13251325
<linkStatic>true</linkStatic>
13261326
<crossCompile>mac</crossCompile>
13271327
<target>arm64-apple-macos11</target>
1328-
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11.0</macOsxDeploymentTarget>
1329-
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11.0</cmakeOsxDeploymentTarget>
1328+
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
1329+
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
13301330
<!-- On *nix, add ASM flags to disable executable stack -->
13311331
<cmakeAsmFlags>-Wa,--noexecstack -target ${target}</cmakeAsmFlags>
13321332
<cmakeCFlags>-O3 -fno-omit-frame-pointer -target ${target}</cmakeCFlags>
@@ -1573,8 +1573,8 @@
15731573
<linkStatic>true</linkStatic>
15741574
<crossCompile>mac</crossCompile>
15751575
<target>x86_64-apple-macos10.12</target>
1576-
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=10.12</macOsxDeploymentTarget>
1577-
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12</cmakeOsxDeploymentTarget>
1576+
<macOsxDeploymentTarget>OSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
1577+
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
15781578
<!-- On *nix, add ASM flags to disable executable stack -->
15791579
<cmakeAsmFlags>-Wa,--noexecstack -target ${target}</cmakeAsmFlags>
15801580
<cmakeCFlags>-O3 -fno-omit-frame-pointer -target ${target}</cmakeCFlags>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@
121121
<strip.skip>false</strip.skip>
122122
<muslCheck.skip>false</muslCheck.skip>
123123
<generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir>
124-
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=10.9</macOsxDeploymentTarget>
125-
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9</cmakeOsxDeploymentTarget>
124+
<macOsxDeploymentTarget>MACOSX_DEPLOYMENT_TARGET=11</macOsxDeploymentTarget>
125+
<cmakeOsxDeploymentTarget>-DCMAKE_OSX_DEPLOYMENT_TARGET=11</cmakeOsxDeploymentTarget>
126126
<jniArch>${os.detected.arch}</jniArch>
127127
<jniClassifier>${os.detected.name}-${os.detected.arch}</jniClassifier>
128128
<skipJapicmp>false</skipJapicmp>

0 commit comments

Comments
 (0)