s

Author: firewave

Makefile

@@ -155,7 +155,7 @@ else ifneq ($(HAVE_RULES),)
     $(error invalid HAVE_RULES value '$(HAVE_RULES)')
 endif
 
-HAVE_EXECINFO_H=$(shell (echo "#include <execinfo.h>") | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+HAVE_EXECINFO_H=$(shell echo -e "\x23#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
 override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)
 
 override CXXFLAGS += $(CXXOPTS)

tools/dmake/dmake.cpp

@@ -771,8 +771,9 @@ int main(int argc, char **argv)
          << "    $(error invalid HAVE_RULES value '$(HAVE_RULES)')\n"
          << "endif\n\n";
 
-    // the # needs to be escaped on older make versions
-    fout << "HAVE_EXECINFO_H=$(shell echo \"#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+    // older make versions require the # to be escaped.
+    // the # needs to be specified as hex because newer make version use it verbatim and thus break this command.
+    fout << "HAVE_EXECINFO_H=$(shell echo -e \"\\x23#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
          << "override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)\n\n";
 
     fout << "override CXXFLAGS += $(CXXOPTS)\n";