Windows fix (#1876)
* win fix * just some ci * test * revert * aaaaa * bbbbbb
This commit is contained in:
parent
2bfe91e4bd
commit
b97598d239
2
.github/workflows/build_and_test.yml
vendored
2
.github/workflows/build_and_test.yml
vendored
@ -593,11 +593,11 @@ jobs:
|
|||||||
run: cargo build --verbose
|
run: cargo build --verbose
|
||||||
- name: Build docs
|
- name: Build docs
|
||||||
run: cargo doc
|
run: cargo doc
|
||||||
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
- name: Set LIBCLANG_PATH
|
- name: Set LIBCLANG_PATH
|
||||||
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
|
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
|
||||||
- name: install cargo-make
|
- name: install cargo-make
|
||||||
run: cargo install --force cargo-make
|
run: cargo install --force cargo-make
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
- name: install cxx bridge
|
- name: install cxx bridge
|
||||||
run: cargo install cxxbridge-cmd
|
run: cargo install cxxbridge-cmd
|
||||||
- name: Build fuzzers/libfuzzer_stb_image
|
- name: Build fuzzers/libfuzzer_stb_image
|
||||||
|
@ -30,6 +30,7 @@ pub fn main() {
|
|||||||
.expect("Failed to parse the command line")
|
.expect("Failed to parse the command line")
|
||||||
.link_staticlib(&dir, "libfuzzer_windows_asan")
|
.link_staticlib(&dir, "libfuzzer_windows_asan")
|
||||||
.add_arg("-lOleAut32.lib")
|
.add_arg("-lOleAut32.lib")
|
||||||
|
.add_arg("-lntdll.lib")
|
||||||
.add_arg("-fsanitize-coverage=trace-pc-guard")
|
.add_arg("-fsanitize-coverage=trace-pc-guard")
|
||||||
.add_arg("-fsanitize=address")
|
.add_arg("-fsanitize=address")
|
||||||
.run()
|
.run()
|
||||||
|
@ -256,7 +256,7 @@ fn main() {
|
|||||||
&& llvm_version.is_ok())
|
&& llvm_version.is_ok())
|
||||||
{
|
{
|
||||||
println!(
|
println!(
|
||||||
"cargo:warning=Failed to find llvm-config, we will not build LLVM passes. If you need them, set the LLVM_CONFIG environment variable to a recent llvm-config."
|
"cargo:warning=Failed to find llvm-config, we will not build LLVM passes. If you need them, set the LLVM_CONFIG environment variable to a recent llvm-config, else just ignore this message."
|
||||||
);
|
);
|
||||||
|
|
||||||
write!(
|
write!(
|
||||||
|
@ -48,7 +48,11 @@ int main(int argc, char **argv) {
|
|||||||
libafl_main();
|
libafl_main();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#ifdef FUZZER_DEFINE_RUN_DRIVER
|
||||||
return LLVMFuzzerRunDriver(&argc, &argv, &LLVMFuzzerTestOneInput);
|
return LLVMFuzzerRunDriver(&argc, &argv, &LLVMFuzzerTestOneInput);
|
||||||
|
#else
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user