diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-11 19:26:43 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-11 19:26:43 +0000 |
| commit | 72e63983e6868d0253968f391632be89b7038ace (patch) | |
| tree | b6b204e4860dcd32b3bd978cc8effb1bddc40721 /common.mk | |
| parent | 395340fa30e1d0b92319c01c2b785d24e8c40294 (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_3@55871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -201,7 +201,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 |