Created
August 21, 2010 09:07
-
-
Save jruby/542033 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/ext/melbourne/bstrlib.c b/lib/ext/melbourne/bstrlib.c | |
index a30f1ec..3ea0d7d 100644 | |
--- a/lib/ext/melbourne/bstrlib.c | |
+++ b/lib/ext/melbourne/bstrlib.c | |
@@ -2707,7 +2707,7 @@ struct genBstrList g; | |
#ifdef __GNUC__ | |
/* Something is making gcc complain about this prototype not being here, so | |
I've just gone ahead and put it in. */ | |
-extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg); | |
+// extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg); | |
#endif | |
#endif | |
diff --git a/lib/ext/melbourne/melbourne.cpp b/lib/ext/melbourne/melbourne.cpp | |
index fd67ca9..5a4239f 100644 | |
--- a/lib/ext/melbourne/melbourne.cpp | |
+++ b/lib/ext/melbourne/melbourne.cpp | |
@@ -35,9 +35,9 @@ void Init_melbourne(void) { | |
melbourne::init_symbols(); | |
-#ifndef RUBINIUS | |
+ // #ifndef RUBINIUS | |
VALUE rb_mRubinius = rb_const_get(rb_cObject, rb_intern("Rubinius")); | |
-#endif | |
+ // #endif | |
rb_cMelbourne = rb_define_class_under(rb_mRubinius, "Melbourne", rb_cObject); | |
rb_define_method(rb_cMelbourne, "string_to_ast", | |
diff --git a/rakelib/ext_helper.rb b/rakelib/ext_helper.rb | |
index cec670f..393fae8 100644 | |
--- a/rakelib/ext_helper.rb | |
+++ b/rakelib/ext_helper.rb | |
@@ -1,3 +1,4 @@ | |
+require "mkmf" | |
require "rbconfig" | |
$verbose = Rake.application.options.trace || ARGV.delete("-v") | |
@@ -55,6 +56,8 @@ def add_cflag(*flags) | |
end | |
def add_cxxflag(*flags) | |
+ puts flags | |
+ puts caller(0) | |
flags.each { |f| $CXXFLAGS << " #{f}" } | |
end | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment