Skip to content

Commit

Permalink
Only add extra ldflags on linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
normanmaurer committed Oct 31, 2024
1 parent 6e5bf3f commit c805592
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion boringssl-static/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -668,6 +668,17 @@
</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>

Expand Down

0 comments on commit c805592

Please sign in to comment.