Revert conditional setting of CXX and removal of CSSFLAGS from linker line.