Fix Makefile patch: avoid $(CXX) recursive definition