[cvc4/f20] (4 commits) ...Add missing line continuation in merged changes.

[Jerry James]

Summary of changes:

  6f20269... allow build without gperftools (*)
  ee6164b... catch also s390{,x} whose triplet is s390{,x}-ibm-linux-gnu (*)
  4ead8ba... Merge changes from Dan Horák to fix secondary arch builds. (*)
  f90fcc7... Add missing line continuation in merged changes. (*)

(*) This commit already existed in another branch; no separate mail sent