Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows builds for Python & Go #1442

Merged
merged 6 commits into from
Dec 12, 2021
Merged

Fix Windows builds for Python & Go #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d636c4
Try specifying bcrypt lib
gj Dec 11, 2021
6c3da2f
Test in CI
gj Dec 11, 2021
4968382
Revert "Test in CI"
gj Dec 11, 2021
dcd6d79
Compare build size w/ and w/o bcrypt
gj Dec 11, 2021
7e14d21
Go too
gj Dec 11, 2021
1e41596
Revert "Compare build size w/ and w/o bcrypt"
gj Dec 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion languages/go/internal/ffi/ffi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package ffi
// #cgo linux,amd64 LDFLAGS: ${SRCDIR}/native/linux/libpolar.a -ldl -lm
// #cgo darwin,amd64 LDFLAGS: ${SRCDIR}/native/macos/amd64/libpolar.a -ldl -lm
// #cgo darwin,arm64 LDFLAGS: ${SRCDIR}/native/macos/arm64/libpolar.a -ldl -lm
// #cgo windows,amd64 LDFLAGS: ${SRCDIR}/native/windows/libpolar.a -lm -lws2_32 -luserenv
// #cgo windows,amd64 LDFLAGS: ${SRCDIR}/native/windows/libpolar.a -lm -lws2_32 -luserenv -lbcrypt
import "C"

import (
Expand Down
1 change: 1 addition & 0 deletions languages/python/oso/polar/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
libs.append("Ws2_32.lib")
libs.append("advapi32.lib")
libs.append("userenv.lib")
libs.append("bcrypt.lib")
else:
libs.append(lib_dirs[env] + "/libpolar.a")
include_dir = include_dirs[env]
Expand Down