Update for upstream with new -lm requirement for debug