From cfb021f33628ba2b958c819cac8c1260087bf0c0 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Thu, 31 Oct 2024 11:46:22 +0100
Subject: [PATCH] Only add extra ldflags on linux (#901)

Motivation:

We need to ensure we only add the extra ldflags on linux as otherwise
compilation will fail on macOS

Modifications:

Add the ldflags on linux only

Result:

Be able to compile on macOS again
---
 boringssl-static/pom.xml                      | 31 +++++++++++++++++--
 .../netty/internal/tcnative/NativeTest.java   |  3 +-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/boringssl-static/pom.xml b/boringssl-static/pom.xml
index e69b47d4..401b9f9a 100644
--- a/boringssl-static/pom.xml
+++ b/boringssl-static/pom.xml
@@ -93,7 +93,7 @@
     <msvcSslLibs>ssl.lib;crypto.lib</msvcSslLibs>
     <cflags>-Werror -fno-omit-frame-pointer -fvisibility=hidden -Wunused -Wno-unused-value -O3</cflags>
     <cppflags>-DHAVE_OPENSSL -I${boringsslSourceDir}/include</cppflags>
-    <ldflags>-L${boringsslHome}/ssl -L${boringsslHome}/crypto -lssl -lcrypto -static-libstdc++ -l:libstdc++.a</ldflags>
+    <ldflags>-L${boringsslHome}/ssl -L${boringsslHome}/crypto -lssl -lcrypto</ldflags>
     <skipJapicmp>true</skipJapicmp>
     <!-- We need to use the same module name for all our "native" impls as only one should be loaded -->
     <javaModuleName>${javaDefaultModuleName}</javaModuleName>
@@ -563,6 +563,33 @@
                 </configuration>
               </execution>
 
+              <execution>
+                <id>ldflags-setup</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <exportAntProperties>true</exportAntProperties>
+                  <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="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>
+              </execution>
+
               <!-- Build the additional JAR that contains the native library. -->
               <execution>
                 <id>native-jar</id>
@@ -658,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>
diff --git a/boringssl-static/src/test/java/io/netty/internal/tcnative/NativeTest.java b/boringssl-static/src/test/java/io/netty/internal/tcnative/NativeTest.java
index 14fe262a..2acb57a4 100644
--- a/boringssl-static/src/test/java/io/netty/internal/tcnative/NativeTest.java
+++ b/boringssl-static/src/test/java/io/netty/internal/tcnative/NativeTest.java
@@ -25,10 +25,11 @@ public class NativeTest {
     @Test
     public void loadNativeLib() throws Exception {
         String testClassesRoot =  NativeTest.class.getProtectionDomain().getCodeSource().getLocation().getFile();
+        File f = new File(testClassesRoot + File.separator + "META-INF" + File.separator + "native");
         File[] directories = new File(testClassesRoot + File.separator + "META-INF" + File.separator + "native")
                 .listFiles();
         if (directories == null || directories.length != 1) {
-            throw new IllegalStateException("Could not find platform specific native directory");
+            throw new IllegalStateException("Could not find platform specific native directory: " + f);
         }
         String libName = System.mapLibraryName("netty_tcnative")
                 // Fix the filename (this is needed for macOS).