Merge remote branch 'alexis/wip'

Conflicts:
	c_src/exec._nitni.h
	c_src/file._nitni.h
	c_src/math._nitni.h
	c_src/stream._nitni.h
	c_src/string._nitni.h
	c_src/time._nitni.h

diff --cc bin/gccx
Simple merge

diff --cc lib/standard/file.nit
Simple merge

diff --cc lib/standard/file_nit.h
Simple merge

diff --cc src/native_interface/frontier.nit
Simple merge

diff --cc src/nitc.nit
index 09b297f,6a1ea05..e8f7d80
--- 1/src/nitc.nit
--- 2/src/nitc.nit
+++ b/src/nitc.nit
@@@ -52,11 -58,18 +52,11 @@@ class NitCompile
                boost = opt_boost.value
                no_cc = opt_no_cc.value
                cc_link = not opt_cc_no_link.value
-               cc_lib_paths = opt_cc_lib_paths.value
-               cc_libs = opt_cc_libs.value
-               cc_include_paths = opt_cc_include_paths.value
+               cc_lib_paths.add_all( opt_cc_lib_paths.value )
+               cc_libs.add_all( opt_cc_libs.value )
+               cc_include_paths.add_all( opt_cc_include_paths.value )
                var ext = opt_extension_prefix.value
                if ext != null then ext_prefix = ext else ext_prefix = ""
 -              global = opt_global.value
 -              use_SFT_optimization = not opt_global_no_STF_opt.value
 -              no_dead_method_removal = opt_global_no_DMR_opt.value
 -              no_inline_get_set = opt_global_no_inline_get_set.value
 -              no_callgraph_from_init = opt_global_no_RFIMA.value
 -              no_out_of_init_get_test_removal = opt_global_no_out_of_init_get_test_opt.value
 -              global_callgraph = opt_global_callgraph.value_name
                compdir = opt_compdir.value
                if compdir == null then
                        var dir = once ("NIT_COMPDIR".to_symbol).environ

diff --cc src/syntax/mmbuilder.nit
Simple merge