Further build fixes
Further build fixes

(no idea how this works fine on OS X)

Former-commit-id: 9437a75af2603420b6a66452f716148f484e5db6
Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,darkbuck/Halide,Trass3r/Halide