summaryrefslogtreecommitdiff
path: root/ACE/include/makeinclude/wrapper_macros.GNU
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/include/makeinclude/wrapper_macros.GNU')
-rw-r--r--ACE/include/makeinclude/wrapper_macros.GNU8
1 files changed, 7 insertions, 1 deletions
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 8627695fccd..0966a023d0e 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -315,7 +315,7 @@ endif # ! COMPSPEC
ifdef COMSPEC
#### Assume we're on a WIN32 host.
- ACE_NUL = nul
+ ACE_NUL = $(if $(findstring /bin/sh,$(SHELL)),/dev/null,nul)
else # ! WIN32
ACE_NUL = /dev/null
endif # ! WIN32
@@ -704,6 +704,12 @@ valgrind ?=
ifeq ($(valgrind),1)
CPPFLAGS += -DACE_HAS_VALGRIND
endif
+# Does the valgrind version support --keep-debug-info, if not
+# we disable dlclose in ACE to get complete callstacks
+valgrind_keep_debuginfo ?=
+ifeq ($(valgrind_keep_debuginfo),0)
+ CPPFLAGS += -DACE_LACKS_DLCLOSE
+endif
profile ?=
ifeq ($(profile),0)