diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml index cdf0c7fd5..260f676d5 100644 --- a/.github/workflows/extra-builds.yml +++ b/.github/workflows/extra-builds.yml @@ -59,7 +59,6 @@ jobs: cmake -S . -B build -A x64 -DCMAKE_BUILD_TYPE=Release - -DYOSYS_WITHOUT_ABC=ON - name: Build run: > diff --git a/abc b/abc index 3df13d9aa..1e85fff18 160000 --- a/abc +++ b/abc @@ -1 +1 @@ -Subproject commit 3df13d9aad89374854c55a27e8db10141397c973 +Subproject commit 1e85fff18db313b29584dc1ff7c2074d2275a381 diff --git a/cmake/YosysAbc.cmake b/cmake/YosysAbc.cmake index 3b2267504..1c59308d3 100644 --- a/cmake/YosysAbc.cmake +++ b/cmake/YosysAbc.cmake @@ -61,8 +61,16 @@ function(yosys_abc_target arg_LIBNAME arg_EXENAME) ABC_NO_DYNAMIC_LINKING $<${YOSYS_ENABLE_THREADS}:ABC_USE_PTHREADS> $<${YOSYS_ENABLE_READLINE}:ABC_USE_READLINE> + $<$:ABC_USE_PTHREADS> + $<$:_WINSOCKAPI_> + $<$:HAVE_STRUCT_TIMESPEC> ABC_NO_RLIMIT ) + target_compile_options(${arg_LIBNAME} PRIVATE + $<$:/wd4576> + $<$:/Zc:strictStrings-> + ) + target_safe_compile_options(${arg_LIBNAME} PRIVATE -fpermissive -fno-exceptions @@ -78,10 +86,14 @@ function(yosys_abc_target arg_LIBNAME arg_EXENAME) $<${YOSYS_ENABLE_THREADS}:Threads::Threads> $<${YOSYS_ENABLE_READLINE}:PkgConfig::readline> $<$:-lshlwapi> + $<$:${CMAKE_SOURCE_DIR}/abc/lib/x64/pthreadVC2.lib> ) set_target_properties(${arg_LIBNAME} PROPERTIES YOSYS_IS_ABC ON ) + if(MSVC) + install(FILES "${CMAKE_SOURCE_DIR}/abc/lib/x64/pthreadVC2.dll" DESTINATION bin) + endif() yosys_cxx_executable(${arg_EXENAME} OUTPUT_NAME ${arg_EXENAME}