diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 06:03:51 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 06:03:51 +0000 |
| commit | fc5238a491b41053c39e1586708ec6e5f2736da6 (patch) | |
| tree | b9ed988f5042fc1b877734f2788a54689d44b515 /common.mk | |
| parent | caec808f74a7545cc2b6930dbfa629071315f065 (diff) | |
merge revision(s) 55434: [Backport #12401]
* common.mk (build-ext), ext/extmk.rb: use variable EXTENCS
different than ENCOBJS, to get rid of circular dependency.
build libencs when linking encodings statically.
[ruby-core:75618] [Bug #12401]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -187,7 +187,7 @@ configure-ext: $(EXTS_MK) build-ext: $(EXTS_MK) $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ - ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) + EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) prog: program wprogram |