[前][次][番号順一覧][スレッド一覧]

ruby-changes:46861

From: nobu <ko1@a...>
Date: Wed, 31 May 2017 15:40:53 +0900 (JST)
Subject: [ruby-changes:46861] nobu:r58976 (trunk): Makefile.sub: set ENABLE_SHARED [ci skip]

nobu	2017-05-31 15:40:49 +0900 (Wed, 31 May 2017)

  New Revision: 58976

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58976

  Log:
    Makefile.sub: set ENABLE_SHARED [ci skip]
    
    * win32/Makefile.sub (LIBRUBY_LDSHARED): mswin build always
      enables shared.

  Modified files:
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 58975)
+++ common.mk	(revision 58976)
@@ -1080,7 +1080,7 @@ lldb: miniruby$(EXEEXT) PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1080
 	lldb -o '$(LLDB_INIT)' miniruby$(EXEEXT) -- $(TESTRUN_SCRIPT)
 
 lldb-ruby: $(PROGRAM) PHONY
-	lldb $(enable_shared:yes=-o 'target modules add $(LIBRUBY_SO)') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT)
+	lldb $(enable_shared:yes=-o 'target modules add ${LIBRUBY_SO}') -o '$(LLDB_INIT)' $(PROGRAM) -- $(TESTRUN_SCRIPT)
 
 dist:
 	$(BASERUBY) $(srcdir)/tool/make-snapshot \
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 58975)
+++ win32/Makefile.sub	(revision 58976)
@@ -284,6 +284,7 @@ RCFLAGS=-nologo https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L284
 !endif
 !endif
 
+ENABLE_SHARED = yes
 LIBRUBY_LDSHARED = $(LDSHARED)
 LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -implib:dummy.lib -def:$(RUBYDEF)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]