Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 1 | From 12646c0899dec1b127ce71ebacf2571c1c7360f4 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:26:37 +0400 |
Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame] | 4 | Subject: [PATCH] gcc: Fix argument list too long error. |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | There would be an "Argument list too long" error when the |
| 7 | build directory is longer than 200, this is caused by: |
| 8 | |
| 9 | headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u` |
| 10 | |
| 11 | The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle |
| 12 | it, use the $(sort list) of GNU make which can handle the too long list |
| 13 | would fix the problem, the header would be short enough after sorted. |
| 14 | The "tr ' ' '\012'" was used for translating the space to "\n", the |
| 15 | $(sort list) doesn't need this. |
| 16 | |
| 17 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 20 | RP: gcc then added *.h and *.def additions to this list, breaking the original |
| 21 | fix. Add the sort to the original gcc code, leaving the tr+sort to fix the original |
| 22 | issue but include the new files too as reported by Zhuang <qiuguang.zqg@alibaba-inc.com> |
| 23 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 24 | Upstream-Status: Pending |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 26 | --- |
| 27 | gcc/Makefile.in | 2 +- |
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 29 | |
| 30 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 31 | index 7da6f439fff..59c45c81393 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 32 | --- a/gcc/Makefile.in |
| 33 | +++ b/gcc/Makefile.in |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame^] | 34 | @@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype |
| 35 | # We keep the directory structure for files in config, common/config or |
| 36 | # c-family and .def files. All other files are flattened to a single directory. |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 37 | $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) |
| 38 | - headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 39 | + headers=`echo $(sort $(PLUGIN_HEADERS)) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \ |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 40 | srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \ |
| 41 | for file in $$headers; do \ |
| 42 | if [ -f $$file ] ; then \ |