s

Author: firewave

Makefile

@@ -155,12 +155,12 @@ else ifneq ($(HAVE_RULES),)
     $(error invalid HAVE_RULES value '$(HAVE_RULES)')
 endif
 
-# older make versions do not support # in $(shell) and newer ones do not handle the escape sequence right
+# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally
 REQUIRE_ESCAPE=$(shell echo "\#define DEF" | $(CXX) -c -xc - && echo "1" || echo "0")
 ifeq ($(REQUIRE_ESCAPE),1)
-	HAVE_EXECINFO_H=$(shell echo "\#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+    HAVE_EXECINFO_H=$(shell echo "\#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
 else
-	HAVE_EXECINFO_H=$(shell echo "#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
+    HAVE_EXECINFO_H=$(shell echo "#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
 endif
 override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)
 

tools/dmake/dmake.cpp

@@ -771,9 +771,13 @@ int main(int argc, char **argv)
          << "    $(error invalid HAVE_RULES value '$(HAVE_RULES)')\n"
          << "endif\n\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 \"\\x23include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+    fout << "# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally\n"
+         << "REQUIRE_ESCAPE=$(shell echo \"\\#define DEF\" | $(CXX) -c -xc - && echo \"1\" || echo \"0\")\n"
+         << "ifeq ($(REQUIRE_ESCAPE),1)\n"
+         << "    HAVE_EXECINFO_H=$(shell echo \"\\#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "else\n"
+         << "    HAVE_EXECINFO_H=$(shell echo \"#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
+         << "endif\n"
          << "override CPPFLAGS += -DHAVE_EXECINFO_H=$(HAVE_EXECINFO_H)\n\n";
 
     fout << "override CXXFLAGS += $(CXXOPTS)\n";