flags

netty · Oct 31, 2024 · dd66064 · dd66064
1 parent 6b3ab18
commit dd66064
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/boringssl-static/pom.xml b/boringssl-static/pom.xml
@@ -574,13 +574,17 @@
                   <target>
                     <!-- Add the ant tasks from ant-contrib -->
                     <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+                    <echo message="Setup flags to use during linking" />
 
                     <!-- If we compile on linux we need to adjust the ldflags to correct link libstdc++ -->
                     <if>
                       <equals arg1="${os.detected.name}" arg2="linux" />
                       <then>
-                        <property name="ldflags" value="-L${boringsslHome}/ssl -L${boringsslHome}/crypto -lssl -lcrypto -static-libstdc++ -l:libstdc++.a" />
+                        <property name="hawtjniLdflags" value="-L${boringsslHome}/ssl -L${boringsslHome}/crypto -lssl -lcrypto -static-libstdc++ -l:libstdc++.a" />
                       </then>
+                      <else>
+                        <property name="hawtjniLdflags" value="${ldflags}" />
+                      </else>
                     </if>
                   </target>
                 </configuration>
@@ -681,7 +685,7 @@
                     <configureArg>${macOsxDeploymentTarget}</configureArg>
                     <configureArg>CFLAGS=${cflags}</configureArg>
                     <configureArg>CPPFLAGS=${cppflags}</configureArg>
-                    <configureArg>LDFLAGS=${ldflags}</configureArg>
+                    <configureArg>LDFLAGS=${hawtjniLdflags}</configureArg>
                   </configureArgs>
                 </configuration>
               </execution>