mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-02 11:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NBonaparte-linuxdynlib'

Browse Source
This commit is contained in:
Andrew Kelley 2019-05-29 19:49:10 -04:00
commit 7bfae39c5c
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
std/dynamic_library.zig
View File

@ -114,7 +114,7 @@ pub const LinuxDynLib = struct {
null,
size,
os.PROT_READ | os.PROT_EXEC,
os.MAP_PRIVATE | os.MAP_LOCKED,
os.MAP_PRIVATE,
fd,
0,
);

4
test/build_examples.zig
View File

@ -17,9 +17,7 @@ pub fn addCases(cases: *tests.BuildExamplesContext) void {
cases.addBuildFile("test/standalone/use_alias/build.zig");
cases.addBuildFile("test/standalone/brace_expansion/build.zig");
cases.addBuildFile("test/standalone/empty_env/build.zig");
if (false) {
// TODO this test is disabled because it is failing on the CI server's linux. when this is fixed
// enable it for at least linux
if (builtin.os == builtin.Os.linux) {
// TODO hook up the DynLib API for windows using LoadLibraryA
// TODO figure out how to make this work on darwin - probably libSystem has dlopen/dlsym in it
cases.addBuildFile("test/standalone/load_dynamic_library/build.zig");