Fix archive construction to support llvm