summaryrefslogtreecommitdiff
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
commit76bca90c5b5e5009f85611192dd65b8d2bec0e50 (patch)
tree174ae12ff86b58f9cbebb14d4a1ca54449933fd1
parent0cdfc49d9df7376cd7192bb23e29d05c1046c9be (diff)
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)