Stuck on cairo for an OSX 10.10 build at BZR 5369

Hello KiCadders!

I’m stuck on building from source here. It appears to be cairo’s fault, as far as I can tell.

ld: warning: ignoring file /Library/Frameworks/cairo.framework/cairo, file was built for i386 which is not the architecture being linked (x86_64): /Library/Frameworks/cairo.framework/cairo
Undefined symbols for architecture x86_64:
...
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** [kicad/kicad.app/Contents/PlugIns/_pcbnew.kiface] Error 1
make[1]: *** [pcbnew/CMakeFiles/pcbnew_kiface.dir/all] Error 2
make: *** [all] Error 2

Full log: https://gist.github.com/Squeegy/f4947202b84f6e1c57ea

and file /Library/Frameworks/cairo.framework/cairo yields:

/Library/Frameworks/cairo.framework/cairo: Mach-O dynamically linked shared library i386

When I want that to say x86_64, I think.

It looks like /Library/Frameworks/cairo.framework isn’t put there by my homebrew installed cairo at all. Not sure where it came from. But if I move it, it complains that it can’t find cairo at all.

And yes, I did install cairo as a universal binary brew install cairo --universal but again, it appears the file it’s trying to use is not managed by the homebrew installation of cairo.

Any ideas?