Placate win32 build; no idea how it can be working currently on tinderbox.
This commit is contained in:
parent
bcc104ce79
commit
0f9d460e24
|
@ -1081,7 +1081,7 @@ CRATE_DEPFILES := $(subst $(S)src/,,$(ALL_TEST_CRATES:%.rc=%.d)) \
|
||||||
boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
|
boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
|
||||||
$(MKFILES) boot/rustboot$(X)
|
$(MKFILES) boot/rustboot$(X)
|
||||||
@$(call E, dep: $@)
|
@$(call E, dep: $@)
|
||||||
$(BOOT) -o $(patsubst %.d,%,$@) -shared -rdeps $< >$@.tmp
|
$(BOOT) -o $(patsubst %.d,%$(X),$@) -shared -rdeps $< >$@.tmp
|
||||||
$(Q)$(CFG_PATH_MUNGE) $@.tmp
|
$(Q)$(CFG_PATH_MUNGE) $@.tmp
|
||||||
$(Q)rm -f $@.tmp.bak
|
$(Q)rm -f $@.tmp.bak
|
||||||
$(Q)mv $@.tmp $@
|
$(Q)mv $@.tmp $@
|
||||||
|
@ -1089,14 +1089,14 @@ boot/$(CFG_STDLIB).d: $(STDLIB_CRATE) $(STDLIB_INPUTS) \
|
||||||
stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \
|
stage0/rustc$(X).d: $(COMPILER_CRATE) $(COMPILER_INPUTS) \
|
||||||
$(STDLIB_CRATE) $(MKFILES) boot/rustboot$(X)
|
$(STDLIB_CRATE) $(MKFILES) boot/rustboot$(X)
|
||||||
@$(call E, dep: $@)
|
@$(call E, dep: $@)
|
||||||
$(BOOT) -o $(patsubst %.d,%,$@) -shared -rdeps $< >$@.tmp
|
$(BOOT) -o $(patsubst %.d,%$(X),$@) -shared -rdeps $< >$@.tmp
|
||||||
$(Q)$(CFG_PATH_MUNGE) $@.tmp
|
$(Q)$(CFG_PATH_MUNGE) $@.tmp
|
||||||
$(Q)rm -f $@.tmp.bak
|
$(Q)rm -f $@.tmp.bak
|
||||||
$(Q)mv $@.tmp $@
|
$(Q)mv $@.tmp $@
|
||||||
|
|
||||||
%.d: %.rc $(MKFILES) boot/rustboot$(X)
|
%.d: %.rc $(MKFILES) boot/rustboot$(X)
|
||||||
@$(call E, dep: $@)
|
@$(call E, dep: $@)
|
||||||
$(BOOT) -o $(patsubst %.d,%,$@) -rdeps $< >$@.tmp
|
$(BOOT) -o $(patsubst %.d,%$(X),$@) -rdeps $< >$@.tmp
|
||||||
$(Q)$(CFG_PATH_MUNGE) $@.tmp
|
$(Q)$(CFG_PATH_MUNGE) $@.tmp
|
||||||
$(Q)rm -f $@.tmp.bak
|
$(Q)rm -f $@.tmp.bak
|
||||||
$(Q)mv $@.tmp $@
|
$(Q)mv $@.tmp $@
|
||||||
|
|
|
@ -417,9 +417,9 @@ rust_str* c_str_to_rust(rust_task *task, char const *str) {
|
||||||
return vec_alloc_with_data(task, len, len, 1, (void*)str);
|
return vec_alloc_with_data(task, len, len, 1, (void*)str);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__WIN32__)
|
|
||||||
extern "C" CDECL rust_vec*
|
extern "C" CDECL rust_vec*
|
||||||
rust_list_files(rust_task *task, rust_str *path) {
|
rust_list_files(rust_task *task, rust_str *path) {
|
||||||
|
#if defined(__WIN32__)
|
||||||
array_list<rust_str*> strings;
|
array_list<rust_str*> strings;
|
||||||
WIN32_FIND_DATA FindFileData;
|
WIN32_FIND_DATA FindFileData;
|
||||||
HANDLE hFind = FindFirstFile((char*)path->data, &FindFileData);
|
HANDLE hFind = FindFirstFile((char*)path->data, &FindFileData);
|
||||||
|
@ -431,6 +431,15 @@ rust_list_files(rust_task *task, rust_str *path) {
|
||||||
}
|
}
|
||||||
return vec_alloc_with_data(task, strings.size(), strings.size(),
|
return vec_alloc_with_data(task, strings.size(), strings.size(),
|
||||||
sizeof(rust_str*), strings.data());
|
sizeof(rust_str*), strings.data());
|
||||||
|
#else
|
||||||
|
return NULL;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__WIN32__)
|
||||||
|
extern "C" CDECL rust_str *
|
||||||
|
rust_dirent_filename(rust_task *task, void* ent) {
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
extern "C" CDECL rust_str *
|
extern "C" CDECL rust_str *
|
||||||
|
|
|
@ -76,6 +76,12 @@ rust_run_program(rust_task* task, char* argv[],
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern "C" CDECL int
|
||||||
|
rust_process_wait(void* task, int proc) {
|
||||||
|
// FIXME: stub; exists to placate linker.
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#error "Platform not supported."
|
#error "Platform not supported."
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -17,6 +17,8 @@ rust_dirent_filename
|
||||||
rust_file_is_dir
|
rust_file_is_dir
|
||||||
rust_get_stdin
|
rust_get_stdin
|
||||||
rust_get_stdout
|
rust_get_stdout
|
||||||
|
rust_list_files
|
||||||
|
rust_process_wait
|
||||||
rust_run_program
|
rust_run_program
|
||||||
rust_start
|
rust_start
|
||||||
size_of
|
size_of
|
||||||
|
|
Loading…
Reference in New Issue