Updating script to fix CI issue
This commit is contained in:
parent
9992880f53
commit
9671b341ce
|
@ -235,29 +235,18 @@ add_custom_target(
|
|||
COMMAND $(MAKE) config-gcc
|
||||
COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys
|
||||
COMMENT "Compile Yosys with given Makefile: ${CMAKE_CURRENT_SOURCE_DIR}/yosys/install"
|
||||
COMMENT "Compile Yosys with given Makefile"
|
||||
)
|
||||
|
||||
# yosys compilation ends
|
||||
|
||||
# yosys-plugins compilation starts
|
||||
add_custom_target(
|
||||
YosysVariables ALL ${CMAKE_COMMAND}
|
||||
-D YOSYS_INSTALL=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
|
||||
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/YosysVars.cmake
|
||||
COMMENT "Getting Yosys variables to use in yosys-plugins build: ${YS_CXX}"
|
||||
)
|
||||
add_dependencies(YosysVariables yosys)
|
||||
|
||||
# run makefile provided, we pass-on the options to the local make file
|
||||
add_custom_target(
|
||||
yosys-plugins ALL
|
||||
COMMAND $(MAKE) CXX=${YS_CXX} CXXFLAGS=${YS_CXXFLAGS} LDFLAGS=${YS_LDFLAGS}
|
||||
LDLIBS=${YS_LDLIBS} PLUGINS_DIR=${YS_DATA_DIR}/plugins DATA_DIR=${YS_DATA_DIR}
|
||||
COMMAND $(MAKE) install CXX=${YS_CXX} CXXFLAGS=${YS_CXXFLAGS} LDFLAGS=${YS_LDFLAGS}
|
||||
LDLIBS=${YS_LDLIBS} PLUGINS_DIR=${YS_DATA_DIR}/plugins DATA_DIR=${YS_DATA_DIR}
|
||||
COMMAND $(MAKE)
|
||||
COMMAND $(MAKE) install
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys-plugins
|
||||
COMMENT "Compile Yosys-plugins with given Makefile: ${YS_CXX}"
|
||||
COMMENT "Compile Yosys-plugins with given Makefile"
|
||||
)
|
||||
|
||||
#add_dependencies(yosys-plugins yosys ) #YosysVariables)
|
||||
|
|
|
@ -16,6 +16,10 @@ export OPENFPGA_SCRIPT_PATH="${OPENFPGA_PATH}/openfpga_flow/scripts"
|
|||
export OPENFPGA_TASK_PATH="${OPENFPGA_PATH}/openfpga_flow/tasks"
|
||||
if [ -z $PYTHON_EXEC ]; then export PYTHON_EXEC="python3"; fi
|
||||
|
||||
# Add yosys bin folder in PATH, this is required by yosys-plugins
|
||||
# to install plugins in yosys folder
|
||||
export PATH="${OPENFPGA_PATH}/yosys/install/bin:${PATH}"
|
||||
|
||||
# This function checks the path and
|
||||
# raises warning if the command is not executing
|
||||
# inside current OpendFPGA folder
|
||||
|
|
Loading…
Reference in New Issue