Merge "Fix mac build (ldflags -> ldlibs)"