diff options
Diffstat (limited to 'ext')
-rwxr-xr-x | ext/extmk.rb | 4 | ||||
-rw-r--r-- | ext/tk/extconf.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index e3685d0c7d..3082a00994 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -258,9 +258,9 @@ def extmake(target) $extlibs ||= [] $extpath ||= [] unless $mswin - $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ") + $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ") end - $extlibs = merge_libs($extlibs, $libs.split(/\s+(?=-|\z)/), $LOCAL_LIBS.split(/\s+(?=-|\z)/)) + $extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS)) $extpath |= $LIBPATH end ensure diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index 778201c396..72dd6cf21d 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -1995,7 +1995,7 @@ if TkLib_Config["tcltk-framework"] end end end - $LDFLAGS << ' ' << libs.gsub(/((?:\A|\s)-framework)\s/, "\\1\0") + $LDFLAGS << ' ' << libs $libs << ' -ltk -ltcl' setup_for_macosx_framework(tclver, tkver) if tcl_cfg_dir && tk_cfg_dir end |