summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-03 03:40:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-03 03:40:24 +0000
commitc2b0992156ccb65361eddd4c00d3a35593b0aaea (patch)
treed387c358a9facaef306eaba32c3851eb81fbce89 /win32
parente0515646b90043918b9fb1f3977e7648a8f1d9bd (diff)
configure.in: fix static-linked-ext
* configure.in (--with-static-linked-ext): fix for extensions to be linked statically. * Makefile.in, common.mk: use ENCSTATIC for enc directory. * ext/extmk.rb: supply dependencies of statically linked extension libraries. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub3
1 files changed, 3 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 5f48ed9..e4e14e5 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -360,6 +360,9 @@ COMMON_HEADERS = winsock2.h ws2tcpip.h windows.h
!if "$(EXTSTATIC)" == "static"
ENCOBJS = enc/encinit.$(OBJEXT) enc/libenc.lib enc/libtrans.lib
EXTOBJS = ext/extinit.$(OBJEXT)
+! if !defined(ENCSTATIC)
+ENCSTATIC = static
+! endif
!endif
arch_hdrdir = $(EXTOUT)/include/$(arch)