diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-23 14:58:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-23 14:58:42 +0000 |
| commit | fbee46fe66a0a531ef834e823bd2e600fa3fa095 (patch) | |
| tree | 375804c6ffef39f075d75f48d60d5ad28dbd343b | |
| parent | bec666ce78a897aab64649dcb31b2cf95637c860 (diff) | |
enc/Makefile.in: TARGET_NAME TARGET_ENTRY
* enc/Makefile.in (TARGET_NAME, TARGET_ENTRY): needed for EXTDLDFLAGS
on some platforms. [ruby-core:46600] [Bug #6768]
* enc/depend: no longer needs tweaking DLDFLAGS for TARGET names.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | enc/Makefile.in | 6 | ||||
| -rw-r--r-- | enc/depend | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
4 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Mon Jul 23 23:58:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/Makefile.in (TARGET_NAME, TARGET_ENTRY): needed for EXTDLDFLAGS + on some platforms. [ruby-core:46600] [Bug #6768] + + * enc/depend: no longer needs tweaking DLDFLAGS for TARGET names. + Mon Jul 23 22:48:19 2012 Tanaka Akira <akr@fsij.org> * lib/open-uri.rb: use respond_to? to test Tempfile. diff --git a/enc/Makefile.in b/enc/Makefile.in index 44e714a440..2c15e904dc 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -51,9 +51,13 @@ LDFLAGS = @LDFLAGS@ LDSHARED = @LDSHARED@ ldflags = $(LDFLAGS) dldflags = @DLDFLAGS@ +extdldflags = @EXTDLDFLAGS@ archflag = @ARCH_FLAG@ -DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +DLDFLAGS = $(ldflags) $(dldflags) $(extdldflags) $(archflag) RUBY = $(MINIRUBY) +TARGET_NAME_ = $(@F) # BSD make seems unable to deal with @F with substitution +TARGET_NAME = $(TARGET_NAME_:.@DLEXT@=) +TARGET_ENTRY = @EXPORT_PREFIX@Init_$(TARGET_NAME) WORKDIRS = @WORKDIRS@ diff --git a/enc/depend b/enc/depend index 544185b388..78b9370a02 100644 --- a/enc/depend +++ b/enc/depend @@ -1,8 +1,6 @@ % inplace = File.identical?($srcdir, ".") % workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans" % CONFIG["WORKDIRS"] = workdirs.join(' ') -% CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1') -% dldflags = $2 % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes' % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"]) % dependencies = ENCS + TRANS @@ -115,7 +113,6 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma. $(ECHO) linking <%=mesg%> $(@F) % cmd = link_so.sub(/\$\(OBJS\)/) {obj} % base = File.basename(e) -% cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags % if df $(Q)echo> <%=df%> EXPORTS $(Q)echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 7f9f5cadbc..392941702b 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -777,6 +777,7 @@ s,@OBJEXT@,$(OBJEXT),;t t s,@XCFLAGS@,$(XCFLAGS),;t t s,@XLDFLAGS@,$(XLDFLAGS),;t t s,@DLDFLAGS@,$(DLDFLAGS) $$(LIBPATH),;t t +s,@EXTDLDFLAGS@,$(EXTDLDFLAGS),;t t s,@ARCH_FLAG@,$(ARCH_FLAG),;t t s,@STATIC@,$(STATIC),;t t s,@CCDLFLAGS@,,;t t |