am 2ce7528a: Merge "makeparallel needs global CFLAGS now"

* commit '2ce7528a92d132523317dcb1252cf0c47459038b':
  makeparallel needs global CFLAGS now