diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-10-21 12:52:41 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2020-10-21 12:56:44 -0500 |
| commit | 22532739d89cd5ad3883c6b04ad289db54cf5e41 (patch) | |
| tree | f71653651c73220a9fd5570368b5ec55cd67286f /ACE/include | |
| parent | c4559d9048a3f386528984d8f5d96259642a6a2b (diff) | |
| download | ATCD-22532739d89cd5ad3883c6b04ad289db54cf5e41.tar.gz | |
Updates for Windows-hosted Android NDK cross-compile
Diffstat (limited to 'ACE/include')
| -rw-r--r-- | ACE/include/makeinclude/platform_clang_common.GNU | 2 | ||||
| -rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/platform_clang_common.GNU b/ACE/include/makeinclude/platform_clang_common.GNU index 96cb57ddc2a..cfd7f81f1a3 100644 --- a/ACE/include/makeinclude/platform_clang_common.GNU +++ b/ACE/include/makeinclude/platform_clang_common.GNU @@ -70,7 +70,7 @@ gcc_template_instantiation_visibility ?= 0 # Only modify LDFLAGS if DLD has been set. ifneq ($(DLD),) ifeq ($(DLD),$(CXX_FOR_VERSION_TEST)) # only try this is we are using ld through gcc - LD_FOR_VERSION_TEST = $(shell $(CXX_FOR_VERSION_TEST) -print-prog-name=ld) + LD_FOR_VERSION_TEST = $(subst \,/,$(shell $(CXX_FOR_VERSION_TEST) -print-prog-name=ld)) else LD_FOR_VERSION_TEST = $(DLD) endif # DLD = CXX_FOR_VERSION_TEST diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index 8627695fccd..6790e8cc91e 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 |