diff options
| author | Chip Jones <jonesc@objectcomputing.com> | 2020-05-18 12:19:31 -0500 |
|---|---|---|
| committer | Chip Jones <jonesc@objectcomputing.com> | 2020-05-18 12:19:31 -0500 |
| commit | a72b0d6da47b8ce94d4772601e4a83f00f0394c9 (patch) | |
| tree | a100100896c267948b2c78d831b3c9bbcf35a6e5 | |
| parent | e257dff6722872b25660c8b4fe69d946c0b10626 (diff) | |
| download | ATCD-a72b0d6da47b8ce94d4772601e4a83f00f0394c9.tar.gz | |
Update Android link on Windows hosts to avoid err.
Replace echo/$foreach logic with $file function which avoids
potential tmpfile truncation. Make tmpfile name unique.
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 2d8613c82ea..fd3525162b2 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -180,11 +180,10 @@ LIBS += -llog # link step to avoid 'command line too long' error on Windows ifeq ($(OS), Windows_NT) - SHOBJS_FILE = $(VSHDIR)tmpfile + SHOBJS_FILE = $(VSHDIR)$(MAKEFILE)_object_list.tmp CLEANUP_OBJS += $(SHOBJS_FILE) - define SHLIBBUILD - echo " " > $(SHOBJS_FILE) - $(foreach myobj, $(VSHOBJS), echo $(myobj) >> $(SHOBJS_FILE);) + define SHLIBBUILD + $(file >$(SHOBJS_FILE), $^) $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ @$(SHOBJS_FILE) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) endef endif |