diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-06 05:20:52 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-06 05:20:52 +0000 |
| commit | c50e2851d2803bb37d9cdfa13f4a703812dc1e1c (patch) | |
| tree | 3b94386c48a4283db2245f0dc9aa6055ee8c212c /lib | |
| parent | b6a4e7cea087b176ac82f2cb3fb3f9812a418f40 (diff) | |
* configure.in (POSTLINK): sign built program using RUBY_CODESIGN
identity.
[Backport #9491]
* Makefile.in (PROGRAM): ditto.
* Makefile.in (LIBRUBY_SO): ditto.
* lib/mkmf.rb (LINK_SO): sign extensions too. replace empty line with
default command.
* enc/depend (link_so): prefix $(Q) for each commands.
* tool/mkconfig.rb: restore embedded newlines.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index f5e4e92f39..898e4a78c9 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2308,13 +2308,14 @@ COMPILE_CXX = config_string('COMPILE_CXX') || '$(CXX) $(INCFLAGS) $(CPPFLAGS) $( TRY_LINK = config_string('TRY_LINK') || "$(CC) #{OUTFLAG}conftest $(INCFLAGS) $(CPPFLAGS) " \ "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)" -LINK_SO = config_string('LINK_SO') || +LINK_SO = (config_string('LINK_SO') || "").sub(/^$/) do if CONFIG["DLEXT"] == $OBJEXT "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n" else "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \ "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)" end +end LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"' RPATHFLAG = config_string('RPATHFLAG') || '' LIBARG = config_string('LIBARG') || '-l%s' |