зеркало из https://github.com/github/ruby.git
Revert "Removed extinit.o from main programs"
This reverts commit ac86fcbfd0
.
This change broke "--disable-shared --with-static-linked-ext".
This commit is contained in:
Родитель
3bb6410914
Коммит
405644f38c
|
@ -277,7 +277,7 @@ miniruby$(EXEEXT):
|
|||
$(PROGRAM):
|
||||
@$(RM) $@
|
||||
$(ECHO) linking $@
|
||||
$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
|
||||
$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
|
||||
$(Q) $(POSTLINK)
|
||||
|
||||
PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(gnumake:yes=exec) $(RM) $(LIBRUBY_EXTS)
|
||||
|
|
|
@ -1093,9 +1093,8 @@ miniruby.rc:
|
|||
!if "$(PROGRAM)" != ""
|
||||
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
|
||||
$(ECHO) linking $(@:\=/)
|
||||
$(Q) $(PURIFY) $(CC) $(MAINOBJ) \
|
||||
$(RUBY_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
|
||||
-link $(LDFLAGS) $(XLDFLAGS)
|
||||
$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(EXTOBJS) $(RUBY_INSTALL_NAME).res \
|
||||
$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
|
||||
$(Q) $(LDSHARED_0)
|
||||
$(Q) $(LDSHARED_1)
|
||||
$(Q) $(LDSHARED_2)
|
||||
|
|
Загрузка…
Ссылка в новой задаче