Add build option and Sun specific commands