Allow disabling asm generation via cmake command line. Disable Asm for clang-cl on x86 due to LLVM issue

This commit is contained in:
Daniel Donenfeld 2019-02-11 14:05:25 -08:00
parent b2470df93a
commit addd9fd105
2 changed files with 7 additions and 2 deletions

View File

@ -107,6 +107,9 @@ before_build:
if ("$env:PLATFORM" -eq "x86") { if ("$env:PLATFORM" -eq "x86") {
$env:CFLAGS = "-m32"; $env:CFLAGS = "-m32";
$env:CXXFLAGS = "-m32"; $env:CXXFLAGS = "-m32";
#Disable ASM generation for x86, there are errors with the llvm assembler
$env:CMakeGenFlags = $env:CMakeGenFlags' -DASM_TESTS_ENABLED=FALSE'
} else { } else {
$env:CFLAGS = "-m64"; $env:CFLAGS = "-m64";
$env:CXXFLAGS = "-m64"; $env:CXXFLAGS = "-m64";

View File

@ -247,5 +247,7 @@ function(add_gsl_asm_test name)
set_property(TARGET ${name}_asm PROPERTY FOLDER "GSL_asm_tests") set_property(TARGET ${name}_asm PROPERTY FOLDER "GSL_asm_tests")
endfunction() endfunction()
add_gsl_asm_test(span_tests) if(ASM_TESTS_ENABLED)
add_gsl_asm_test(span_compile_only) add_gsl_asm_test(span_tests)
add_gsl_asm_test(span_compile_only)
endif()