diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-07 04:37:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-07 04:37:08 +0000 |
| commit | 5b3bf854f7415d9ace826232e648668405c8a9c0 (patch) | |
| tree | d314fd0d0ae9afcffd3e03cf8d2c11ffda6dc674 /ext/tk/extconf.rb | |
| parent | 8189483161009fccab36541c974f20c8825ed9ba (diff) | |
* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
command line escape issues on Windows. fixed #4835.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/extconf.rb')
| -rw-r--r-- | ext/tk/extconf.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb index ed150ef356..255e09ccf0 100644 --- a/ext/tk/extconf.rb +++ b/ext/tk/extconf.rb @@ -370,7 +370,7 @@ def collect_tcltk_defs(tcl_defs_str, tk_defs_str) vtcl != vtk ) } - defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}.join(' ') + defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s} end def parse_tclConfig(file) @@ -1942,7 +1942,7 @@ TkLib_Config["checked_shlib_dirs"] = $CPPFLAGS ||= "" # $CPPFLAGS += " #{TclConfig_Info['TCL_DEFS']}" # $CPPFLAGS += " #{TkConfig_Info['TK_DEFS']}" -$CPPFLAGS += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS']) +$defs += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS']) # MacOS X Frameworks? if TkLib_Config["tcltk-framework"] @@ -2018,9 +2018,8 @@ if (TkLib_Config["tcltk-framework"] || $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"] # create - $CPPFLAGS ||= "" - $CPPFLAGS << %[ -DRUBY_VERSION=\\"#{RUBY_VERSION}\\"] - $CPPFLAGS << %[ -DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"] + $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"] + $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"] create_makefile("tcltklib") |