Merge "makeparallel needs global CFLAGS now"