aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-31 06:40:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-31 06:40:49 +0000
commitde301d2e6fa65dd427aa38c4eb0cf880d4e1bd14 (patch)
tree174ae12ff86b58f9cbebb14d4a1ca54449933fd1
parent4bd04bd10926190088d293e1dd1f2598c8ab1817 (diff)
downloadruby-de301d2e6fa65dd427aa38c4eb0cf880d4e1bd14.tar.gz
Makefile.sub: set ENABLE_SHARED [ci skip]
* win32/Makefile.sub (LIBRUBY_LDSHARED): mswin build always enables shared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk2
-rw-r--r--win32/Makefile.sub1
2 files changed, 2 insertions, 1 deletions
diff --git a/common.mk b/common.mk
index 06ef54b70f..bc7601c6ca 100644
--- a/common.mk
+++ b/common.mk
@@ -1080,7 +1080,7 @@ lldb: miniruby$(EXEEXT) PHONY
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 \
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 2f59d83b0b..386fcbfd69 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -284,6 +284,7 @@ RCFLAGS=-nologo
!endif
!endif
+ENABLE_SHARED = yes
LIBRUBY_LDSHARED = $(LDSHARED)
LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -implib:dummy.lib -def:$(RUBYDEF)