riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #41 from RapidSilicon/update_from_upstream 

Pulling refs/heads/update_from_upstream into master
This commit is contained in:
tangxifan 2021-12-07 21:59:42 -08:00 committed by GitHub
parent 71816c968f 4f38c0409b
commit 5b97eea0dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -227,6 +227,10 @@ include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
# #
# we will check if yosys already exist. if not then build it
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/yosys/install/bin/yosys)
message(STATUS "Yosys pre-build exist so skipping it")
else ()
# run makefile provided, we pass-on the options to the local make file # run makefile provided, we pass-on the options to the local make file
add_custom_target( add_custom_target(
yosys ALL yosys ALL
@ -248,6 +252,7 @@ add_custom_target(
) )
add_dependencies(yosys-plugins yosys) add_dependencies(yosys-plugins yosys)
endif()
# run make to extract compiler options, linker options and list of source files # run make to extract compiler options, linker options and list of source files
#add_custom_target( #add_custom_target(

1
libs/EXTERNAL/libargparse/src/argparse.cpp
View File

@ -4,6 +4,7 @@
#include <cassert> #include <cassert>
#include <string> #include <string>
#include <set> #include <set>
#include <limits>
#include "argparse.hpp" #include "argparse.hpp"
#include "argparse_util.hpp" #include "argparse_util.hpp"