Skip to content

Commit 500878b

Browse files
committedMar 28, 2016
Merge branch 'master' into codedb-ffi-io
2 parents dbac57b + 7d071f0 commit 500878b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+368
-223
lines changed
 

‎core/rubinius.rb

+1
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ def self.version
288288
end
289289
end
290290

291+
extra << "C" if Rubinius::CONCURRENT_GC
291292
extra << "D" if Rubinius::DEBUG_BUILD
292293

293294
rev = BUILD_REV[0..7]

‎machine/builtin/block_environment.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "builtin/variable_scope.hpp"
2323

2424
#ifdef ENABLE_LLVM
25-
#include "llvm/state.hpp"
25+
#include "jit/llvm/state.hpp"
2626
#endif
2727

2828
#include <iostream>

0 commit comments

Comments
 (0)