| ... | @@ -1858,28 +1858,30 @@ fn testLinkingObj(b: *Build, opts: Options) *Step { | ... | @@ -1858,28 +1858,30 @@ fn testLinkingObj(b: *Build, opts: Options) *Step { |
| 1858 | fn testLinkingStaticLib(b: *Build, opts: Options) *Step { | 1858 | fn testLinkingStaticLib(b: *Build, opts: Options) *Step { |
| 1859 | const test_step = addTestStep(b, "linking-static-lib", opts); | 1859 | const test_step = addTestStep(b, "linking-static-lib", opts); |
| 1860 | | 1860 | |
| | 1861 | const obj = addObject(b, "bobj", opts); |
| | 1862 | addZigSourceBytes(obj, "export var bar: i32 = -42;"); |
| | 1863 | |
| 1861 | const lib = addStaticLibrary(b, "alib", opts); | 1864 | const lib = addStaticLibrary(b, "alib", opts); |
| 1862 | addZigSourceBytes(lib, | 1865 | addZigSourceBytes(lib, |
| 1863 | \\extern var mod: usize; | 1866 | \\export fn foo() i32 { |
| 1864 | \\export fn callMe() usize { | 1867 | \\ return 42; |
| 1865 | \\ return me * mod; | | |
| 1866 | \\} | 1868 | \\} |
| 1867 | \\var me: usize = 42; | | |
| 1868 | ); | 1869 | ); |
| | 1870 | lib.addObject(obj); |
| 1869 | | 1871 | |
| 1870 | const exe = addExecutable(b, "testlib", opts); | 1872 | const exe = addExecutable(b, "testlib", opts); |
| 1871 | addZigSourceBytes(exe, | 1873 | addZigSourceBytes(exe, |
| 1872 | \\const std = @import("std"); | 1874 | \\const std = @import("std"); |
| 1873 | \\extern fn callMe() usize; | 1875 | \\extern fn foo() i32; |
| 1874 | \\export var mod: usize = 2; | 1876 | \\extern var bar: i32; |
| 1875 | \\pub fn main() void { | 1877 | \\pub fn main() void { |
| 1876 | \\ std.debug.print("{d}\n", .{callMe()}); | 1878 | \\ std.debug.print("{d}\n", .{foo() + bar}); |
| 1877 | \\} | 1879 | \\} |
| 1878 | ); | 1880 | ); |
| 1879 | exe.linkLibrary(lib); | 1881 | exe.linkLibrary(lib); |
| 1880 | | 1882 | |
| 1881 | const run = addRunArtifact(exe); | 1883 | const run = addRunArtifact(exe); |
| 1882 | run.expectStdErrEqual("84\n"); | 1884 | run.expectStdErrEqual("0\n"); |
| 1883 | test_step.dependOn(&run.step); | 1885 | test_step.dependOn(&run.step); |
| 1884 | | 1886 | |
| 1885 | return test_step; | 1887 | return test_step; |