diff --git a/boringssl-static/pom.xml b/boringssl-static/pom.xml
index 429a169f..a9b73ad8 100644
--- a/boringssl-static/pom.xml
+++ b/boringssl-static/pom.xml
@@ -563,6 +563,28 @@
                 </configuration>
               </execution>
 
+              <execution>
+                <id>ldflags-setup</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <!-- Add the ant tasks from ant-contrib -->
+                    <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+                    <!-- 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" />
+                      </then>
+                    </if>
+                  </target>
+                </configuration>
+              </execution>
+
               <!-- Build the additional JAR that contains the native library. -->
               <execution>
                 <id>native-jar</id>
@@ -668,17 +690,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>linux</id>
-      <activation>
-        <os>
-          <family>linux</family>
-        </os>
-      </activation>
-      <properties>
-        <ldflags>-L${boringsslHome}/ssl -L${boringsslHome}/crypto -lssl -lcrypto -static-libstdc++ -l:libstdc++.a</ldflags>
-      </properties>
-    </profile>
     <profile>
       <id>linux-aarch64</id>