diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-05-18 15:45:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 15:45:25 -0500 |
| commit | 71ad93429ff7f99dc50419da5f0cbac9b6af752d (patch) | |
| tree | a057d3a3562885ffdb6aeb7e06a917e429549f69 | |
| parent | b1c483ba83f0af216ee9fb7aea7b109a60a3f68a (diff) | |
| parent | a72b0d6da47b8ce94d4772601e4a83f00f0394c9 (diff) | |
| download | ATCD-71ad93429ff7f99dc50419da5f0cbac9b6af752d.tar.gz | |
Merge pull request #1116 from jonesc-oci/android-win-host-line-too-long
Modify Android link on Windows hosts to avoid error
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 94b52b16748..fd3525162b2 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -177,3 +177,13 @@ endif # Link To Android Logging Library for Log_Msg_Android_Logcat LIBS += -llog + +# link step to avoid 'command line too long' error on Windows +ifeq ($(OS), Windows_NT) + SHOBJS_FILE = $(VSHDIR)$(MAKEFILE)_object_list.tmp + CLEANUP_OBJS += $(SHOBJS_FILE) + define SHLIBBUILD + $(file >$(SHOBJS_FILE), $^) + $(SHR_FILTER) $(SOLINK.cc) $(SO_OUTPUT_FLAG) $@ @$(SHOBJS_FILE) $(LDFLAGS) $(ACE_SHLIBS) $(LIBS) + endef +endif |