From 0a7aada5d18441b437f5e406a991d963b3613d9a Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 17 May 2012 01:55:00 +0000 Subject: [PATCH] fix static-linked-ext * ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS, to be passed to EXTLIBS in exts.mk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- ext/tk/extconf.rb | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b68fd2bfd..1d4a15573f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Thu May 17 10:39:36 2012 Nobuyoshi Nakada +Thu May 17 10:54:58 2012 Nobuyoshi Nakada + + * ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS, to be + passed to EXTLIBS in exts.mk. * enc/encinit.c.erb: use %-lines to adjust indent in the generated file. diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index e7d12ebf9b..155a92f6ab 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1995,7 +1995,8 @@ if TkLib_Config["tcltk-framework"] end end end - $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, '\1=') << ' -ltk -ltcl' + $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, '\1=') + $libs << ' -ltk -ltcl' setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir end