summaryrefslogtreecommitdiff
path: root/ext/tk
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-29 14:11:19 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-29 14:11:19 +0000
commitd7ccf5e1ccf93d6e71246d0eb1ab66ce5b170a70 (patch)
treef1ad3b9a1f9cb85527fa52569838f1321ee01c35 /ext/tk
parent4f4f09d009298e0a35cff6d42338643146c2af0c (diff)
downloadruby-d7ccf5e1ccf93d6e71246d0eb1ab66ce5b170a70.tar.gz
* ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r--ext/tk/extconf.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 1f4f37a215..2f68d01e7f 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -2021,6 +2021,9 @@ if (TkLib_Config["tcltk-framework"] ||
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
$defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
+ # remove harmful definitions.
+ $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}
+
create_makefile("tcltklib")
puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."