Skip to content

5.1.x - Fix Rust library filename on Windows - v1#5623

Merged
victorjulien merged 2 commits intoOISF:master-5.0.xfrom
jasonish:5.0.x-rust-windows-fixup/v1
Dec 2, 2020
Merged

5.1.x - Fix Rust library filename on Windows - v1#5623
victorjulien merged 2 commits intoOISF:master-5.0.xfrom
jasonish:5.0.x-rust-windows-fixup/v1

Conversation

@jasonish
Copy link
Member

@jasonish jasonish commented Dec 1, 2020

Backport of change in master to handle the Rust library being renamed from suricata.lib to libsuricata.a on MinGW build environments.

Moving the libs specified in LDFLAGS to LDADD put them into the
correct placement on in the link command.

(cherry picked from commit 10f639e)
Prior to Rust 1.44, Cargo would name static libs with the .lib
extension. 1.44 changes this extension to .a when running under
a GNU environment on Windows like msys to make it more similar
to other unix environments.

Now assume static library name to be the same on Windows and
unix, but rename the .lib if found to still support older
versions of Rust on Windows.

(cherry picked from commit f3c59ef)
@jasonish jasonish added this to the 5.0 milestone Dec 1, 2020
@jasonish jasonish requested review from a team and victorjulien as code owners December 1, 2020 18:59
@victorjulien victorjulien merged commit a5e1425 into OISF:master-5.0.x Dec 2, 2020
@jasonish jasonish deleted the 5.0.x-rust-windows-fixup/v1 branch July 1, 2021 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants