Back out previous commit; -static is on by default and we don't want to always pass -static to the linker.