aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-22 12:19:16 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-22 12:19:16 +0000
commita49be8a8e378a8b2820c7fdfde3b6a3afd688c7b (patch)
tree03cbcf4e3dcc71e24f8f5a6a1b9940f354f48b73
parent0263002e2f6ec38bd89aebf2aa1edeada988e4c2 (diff)
downloadruby-a49be8a8e378a8b2820c7fdfde3b6a3afd688c7b.tar.gz
* common.mk (build-ext): avoid trying to build dynamic libraries
if configured --with-static-linked-ext. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bbf76fe9e..f1c7d807e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 22 21:07:32 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
+
+ * common.mk (build-ext): avoid trying to build dynamic libraries
+ if configured --with-static-linked-ext.
+
Wed Oct 22 20:33:33 2014 Martin Duerst <duerst@it.aoyama.ac.jp>
* common.mk: Fixed grammar in comment [ci skip]
diff --git a/common.mk b/common.mk
index a228cc9c08..528c7ded66 100644
--- a/common.mk
+++ b/common.mk
@@ -182,7 +182,7 @@ $(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
configure-ext: $(EXTS_MK)
build-ext: $(EXTS_MK)
- $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)"
+ $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)" $(EXTSTATIC)
prog: program wprogram