Merge "Makefile changes to get mclinker to build again."