kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

AR does not need the absolute path

Browse source 
Still use `find` to get rid of potential ARGV limit overflow, since
rustc-genrated object file names are mangled and very long.
This commit is contained in:
Nobuyoshi Nakada 2022-05-17 12:40:33 +09:00
parent c478a3c0a9
commit 3db8db8a32
Notes: git 2022-05-18 14:33:19 +09:00 
Merged: https://github.com/ruby/ruby/pull/5914
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
template/Makefile.in
View file

@ -309,11 +309,12 @@ $(LIBRUBY_A):
$(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) && \
find '$(CARGO_TARGET_DIR)/libyjit/' -name '*.o' -exec $(AR) $(ARFLAGS) $@ '{}' '+' ; \
$(RMALL) libyjit/ && \
$(MAKEDIRS) libyjit/ && \
$(CP) '$(YJIT_LIBS)' libyjit/ && \
(cd libyjit/ && $(AR) -x libyjit.a) && \
: "$(AR) $(ARFLAGS) $@ libyjit/*.$(OBJEXT)" && \
find libyjit/ -name '*.$(OBJEXT)' -exec $(AR) $(ARFLAGS) $@ '{}' '+' ; \
fi
@-$(RANLIB) $@ 2> /dev/null || true