mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

fix v -live on macOS

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-12-05 14:40:14 +03:00
parent 2a1b0a8cae
commit 4888d27b71
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vlib/compiler/live.v
View File

@ -70,7 +70,7 @@ fn (v &V) generate_hotcode_reloading_main_caller() {
fn (v &V) generate_hot_reload_code() { fn (v &V) generate_hot_reload_code() {
mut cgen := v.cgen mut cgen := v.cgen
// Hot code reloading // Hot code reloading
if v.pref.is_live { if v.pref.is_live {
mut file := os.realpath(v.dir) mut file := os.realpath(v.dir)
@ -79,18 +79,18 @@ fn (v &V) generate_hot_reload_code() {
// Need to build .so file before building the live application // Need to build .so file before building the live application
// The live app needs to load this .so file on initialization. // The live app needs to load this .so file on initialization.
mut vexe := os.args[0] mut vexe := os.args[0]
if os.user_os() == 'windows' { if os.user_os() == 'windows' {
vexe = cescaped_path(vexe) vexe = cescaped_path(vexe)
file = cescaped_path(file) file = cescaped_path(file)
} }
mut msvc := '' mut msvc := ''
if v.pref.ccompiler == 'msvc' { if v.pref.ccompiler == 'msvc' {
msvc = '-cc msvc' msvc = '-cc msvc'
} }
so_debug_flag := if v.pref.is_debug { '-g' } else { '' } so_debug_flag := if v.pref.is_debug { '-g' } else { '' }
cmd_compile_shared_library := '$vexe $msvc $so_debug_flag -o $file_base -shared $file' cmd_compile_shared_library := '$vexe $msvc $so_debug_flag -o $file_base -shared $file'
if v.pref.show_c_cmd { if v.pref.show_c_cmd {
println(cmd_compile_shared_library) println(cmd_compile_shared_library)
@ -100,7 +100,7 @@ fn (v &V) generate_hot_reload_code() {
diff := time.ticks() - ticks diff := time.ticks() - ticks
println('compiling shared library took $diff ms') println('compiling shared library took $diff ms')
println('=========\n') println('=========\n')
cgen.genln(' cgen.genln('
void lfnmutex_print(char *s){ void lfnmutex_print(char *s){
@ -114,7 +114,6 @@ void lfnmutex_print(char *s){
if v.os != .windows { if v.os != .windows {
cgen.genln(' cgen.genln('
#include <dlfcn.h>
void* live_lib=0; void* live_lib=0;
int load_so(byteptr path) { int load_so(byteptr path) {
char cpath[1024]; char cpath[1024];
@ -159,7 +158,7 @@ int load_so(byteptr path) {
cgen.genln('$so_fn = (void *)GetProcAddress(live_lib, "$so_fn"); ') cgen.genln('$so_fn = (void *)GetProcAddress(live_lib, "$so_fn"); ')
} }
} }
cgen.genln('return 1; cgen.genln('return 1;
} }

3
vlib/compiler/main.v
View File

@ -284,6 +284,9 @@ pub fn (v mut V) compile() {
if '-debug_alloc' in os.args { if '-debug_alloc' in os.args {
cgen.genln('#define DEBUG_ALLOC 1') cgen.genln('#define DEBUG_ALLOC 1')
} }
if v.pref.is_live && v.os != .windows {
cgen.includes << '#include <dlfcn.h>'
}
//cgen.genln('/*================================== FNS =================================*/') //cgen.genln('/*================================== FNS =================================*/')
cgen.genln('// this line will be replaced with definitions') cgen.genln('// this line will be replaced with definitions')
mut defs_pos := cgen.lines.len - 1 mut defs_pos := cgen.lines.len - 1