summaryrefslogtreecommitdiff
path: root/ext/tk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-06 16:21:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-06 16:21:57 +0000
commitd0d68df7d00f58c8ebb9a74f577dca389876d882 (patch)
tree2824ed0d734a16cb7a4d7cb30c1c45c05a03b293 /ext/tk
parent977bec12363e7e87a19ad81aa063fbf2b4112493 (diff)
mkmf.rb: fix splitting options with an argument
* ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting options with an argument, not using NUL as special character. [ruby-core:47447] [Bug #6987] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r--ext/tk/extconf.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 778201c..72dd6cf 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