| OLD | NEW |
| 1 diff --git a/find/Makefile.in b/find/Makefile.in | 1 diff --git a/find/Makefile.in b/find/Makefile.in |
| 2 --- a/find/Makefile.in | 2 --- a/find/Makefile.in |
| 3 +++ b/find/Makefile.in | 3 +++ b/find/Makefile.in |
| 4 @@ -198,7 +198,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldi
rs | 4 @@ -198,7 +198,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldi
rs |
| 5 CONFIG_HEADER = $(top_builddir)/config.h | 5 CONFIG_HEADER = $(top_builddir)/config.h |
| 6 CONFIG_CLEAN_FILES = | 6 CONFIG_CLEAN_FILES = |
| 7 LIBRARIES = $(noinst_LIBRARIES) | 7 LIBRARIES = $(noinst_LIBRARIES) |
| 8 -AR = ar | 8 -AR = ar |
| 9 +AR ?= ar | 9 +AR ?= ar |
| 10 ARFLAGS = cru | 10 ARFLAGS = cru |
| 11 libfindtools_a_AR = $(AR) $(ARFLAGS) | 11 libfindtools_a_AR = $(AR) $(ARFLAGS) |
| 12 libfindtools_a_LIBADD = | 12 libfindtools_a_LIBADD = |
| 13 @@ -691,13 +691,13 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) | |
| 14 done; rm -f c$${pid}_.???; exit $$bad | |
| 15 find$(EXEEXT): $(find_OBJECTS) $(find_DEPENDENCIES) | |
| 16 @rm -f find$(EXEEXT) | |
| 17 - $(LINK) $(find_OBJECTS) $(find_LDADD) $(LIBS) | |
| 18 + $(LINK) $(find_OBJECTS) $(find_LDADD) ${NACL_CLI_MAIN_LIB} $(LIBS) | |
| 19 ftsfind$(EXEEXT): $(ftsfind_OBJECTS) $(ftsfind_DEPENDENCIES) | |
| 20 @rm -f ftsfind$(EXEEXT) | |
| 21 $(LINK) $(ftsfind_OBJECTS) $(ftsfind_LDADD) $(LIBS) | |
| 22 oldfind$(EXEEXT): $(oldfind_OBJECTS) $(oldfind_DEPENDENCIES) | |
| 23 @rm -f oldfind$(EXEEXT) | |
| 24 - $(LINK) $(oldfind_OBJECTS) $(oldfind_LDADD) $(LIBS) | |
| 25 + $(LINK) $(oldfind_OBJECTS) $(oldfind_LDADD) ${NACL_CLI_MAIN_LIB} $(LIBS) | |
| 26 | |
| 27 mostlyclean-compile: | |
| 28 -rm -f *.$(OBJEXT) | |
| 29 diff --git a/find/ftsfind.c b/find/ftsfind.c | 13 diff --git a/find/ftsfind.c b/find/ftsfind.c |
| 30 --- a/find/ftsfind.c | 14 --- a/find/ftsfind.c |
| 31 +++ b/find/ftsfind.c | 15 +++ b/find/ftsfind.c |
| 32 @@ -74,7 +74,6 @@ | 16 @@ -74,7 +74,6 @@ |
| 33 # define N_(String) String | 17 # define N_(String) String |
| 34 #endif | 18 #endif |
| 35 | 19 |
| 36 - | 20 - |
| 37 static void set_close_on_exec(int fd) | 21 static void set_close_on_exec(int fd) |
| 38 { | 22 { |
| (...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1186 wait_for_proc (false, 1u); | 1170 wait_for_proc (false, 1u); |
| 1187 | 1171 |
| 1188 switch (child) | 1172 switch (child) |
| 1189 { | 1173 { |
| 1190 case -1: | 1174 case -1: |
| 1191 - error (1, errno, _("cannot fork")); | 1175 - error (1, errno, _("cannot fork")); |
| 1192 + error (1, errno, _("cannot vfork")); | 1176 + error (1, errno, _("cannot vfork")); |
| 1193 | 1177 |
| 1194 case 0: /* Child. */ | 1178 case 0: /* Child. */ |
| 1195 prep_child_for_exec(); | 1179 prep_child_for_exec(); |
| OLD | NEW |