diff options
| author | Alan Wu <XrXr@users.noreply.github.com> | 2022-04-28 17:52:21 -0400 |
|---|---|---|
| committer | Alan Wu <XrXr@users.noreply.github.com> | 2022-04-28 19:02:26 -0400 |
| commit | 99281f513cf7d4873d2f672860f80e063f98b7cb (patch) | |
| tree | 8f311ffff22a623338d9d694a9afa765afe4cd31 /template/Makefile.in | |
| parent | 907b31d7b92fd0eb98507dca6411d07da0fecb46 (diff) | |
| download | ruby-99281f513cf7d4873d2f672860f80e063f98b7cb.tar.gz | |
YJIT: Handle spaces in build dir path using find(1) `-exec`
Previously, we relied on shell word splitting, which leads
to passing the wrong arguments when there are white spaces
in the path.
Avoiding command substitution also makes this script more
likely to work under Solaris 10, where `/bin/sh` is not
POSIX compliant [1]. (Thanks you, `@znz` for fixing the syntax
error in 4210ae2158b545beda908fb29e03d23994f262e3 though!)
The hack from c466f270b891962518763ad299f907beac0ebf62
doesn't actually work so this commit reverts it. The shell
still needs to parse through all of the code, maybe because
make doesn't in fact send newlines to the shell.
By the way, we also use the `-exec` option in the `ext/distclean` task.
[1]: https://docs.oracle.com/cd/E26505_01/html/816-5165/sh-1.html
Diffstat (limited to 'template/Makefile.in')
| -rw-r--r-- | template/Makefile.in | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/template/Makefile.in b/template/Makefile.in index 82e0108afb..dc843f14ba 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -272,13 +272,6 @@ DESTDIR = @DESTDIR@ configure_args = @configure_args@ #### End of variables -# Shell short-circuiting for dodging syntax error on older shells, e.g. -# Solaris. Hack: make sends <backslash><newline> to the shell per POSIX, and -# two backslashes stops escaping the newline. -YJIT_BUILD_ONLY0 = $(YJIT_SUPPORT:no=exit; \\) -YJIT_BUILD_ONLY1 = $(YJIT_BUILD_ONLY0:dev=) -YJIT_BUILD_ONLY = $(YJIT_BUILD_ONLY1:yes=) - ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h .SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT) @@ -312,14 +305,15 @@ $(LIBRUBY_A): @-[ -z "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE) $(ECHO) linking static-library $@ $(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS) - $(Q) $(YJIT_BUILD_ONLY)\ + $(Q) if [ 'no' != '$(YJIT_SUPPORT)' ]; then \ set -eu && \ echo 'merging $(YJIT_LIBS) into $@' && \ $(RMALL) '$(CARGO_TARGET_DIR)/libyjit/' && \ $(MAKEDIRS) '$(CARGO_TARGET_DIR)/libyjit/' && \ $(CP) '$(YJIT_LIBS)' '$(CARGO_TARGET_DIR)/libyjit/' && \ (cd '$(CARGO_TARGET_DIR)/libyjit/' && $(AR) -x libyjit.a) && \ - $(AR) $(ARFLAGS) $@ `find '$(CARGO_TARGET_DIR)/libyjit/' -name '*.o'` ; + find '$(CARGO_TARGET_DIR)/libyjit/' -name '*.o' -exec $(AR) $(ARFLAGS) $@ '{}' '+' ; \ + fi @-$(RANLIB) $@ 2> /dev/null || true verify-static-library: $(LIBRUBY_A) |