зеркало из https://github.com/github/ruby.git
mkmf.rb: fix framework option
* lib/mkmf.rb (have_framework): should append framework options to $LIBS, not $LDFLAGS. the former is propagated to exts.mk when enable-static-linked-ext. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
e3a9aee513
Коммит
3976eb12ff
|
@ -1,5 +1,9 @@
|
|||
2013-10-14 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/mkmf.rb (have_framework): should append framework options to
|
||||
$LIBS, not $LDFLAGS. the former is propagated to exts.mk when
|
||||
enable-static-linked-ext.
|
||||
|
||||
* lib/mkmf.rb (create_makefile): ranlib on static library, not DLLIB.
|
||||
|
||||
2013-10-13 Andrew Grimm <andrew.j.grimm@gmail.com>
|
||||
|
|
|
@ -1487,8 +1487,8 @@ end
|
|||
|
||||
def setup_for_macosx_framework(tclver, tkver)
|
||||
# use framework, but no tclConfig.sh
|
||||
unless $LDFLAGS && $LDFLAGS.include?('-framework')
|
||||
($LDFLAGS ||= "") << ' -framework Tk -framework Tcl'
|
||||
unless $LIBS && $LIBS.include?('-framework')
|
||||
($LIBS ||= "") << ' -framework Tk -framework Tcl'
|
||||
end
|
||||
|
||||
if TkLib_Config["tcl-framework-header"]
|
||||
|
|
|
@ -1098,7 +1098,7 @@ SRC
|
|||
# TODO: non-worse way than this hack, to get rid of separating
|
||||
# option and its argument.
|
||||
$LDFLAGS << " -ObjC" unless /(\A|\s)-ObjC(\s|\z)/ =~ $LDFLAGS
|
||||
$LDFLAGS << opt
|
||||
$LIBS << opt
|
||||
true
|
||||
else
|
||||
false
|
||||
|
|
Загрузка…
Ссылка в новой задаче