Skip to content

Commit 7504e6d

Browse files
committed
s
1 parent 46bf0d2 commit 7504e6d

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ else ifneq ($(HAVE_RULES),)
156156
endif
157157

158158
# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally
159-
REQUIRE_ESCAPE=$(shell echo "\#define DEF" | $(CXX) -c -xc - && echo "1" || echo "0")
159+
REQUIRE_ESCAPE=$(shell echo "\#define DEF" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
160160
ifeq ($(REQUIRE_ESCAPE),1)
161161
HAVE_EXECINFO_H=$(shell echo "\#include <execinfo.h>" | $(CXX) -c -xc - 2> /dev/null && echo "1" || echo "0")
162162
else

tools/dmake/dmake.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ int main(int argc, char **argv)
772772
<< "endif\n\n";
773773

774774
fout << "# older make versions do not support # in $(shell) and newer ones handle the escape sequence literally\n"
775-
<< "REQUIRE_ESCAPE=$(shell echo \"\\#define DEF\" | $(CXX) -c -xc - && echo \"1\" || echo \"0\")\n"
775+
<< "REQUIRE_ESCAPE=$(shell echo \"\\#define DEF\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
776776
<< "ifeq ($(REQUIRE_ESCAPE),1)\n"
777777
<< " HAVE_EXECINFO_H=$(shell echo \"\\#include <execinfo.h>\" | $(CXX) -c -xc - 2> /dev/null && echo \"1\" || echo \"0\")\n"
778778
<< "else\n"

0 commit comments

Comments
 (0)