diff options
| author | Sean Cross <sean@xobs.io> | 2019-10-24 13:35:38 +0800 |
|---|---|---|
| committer | Sean Cross <sean@xobs.io> | 2019-10-24 13:39:00 +0800 |
| commit | 5b993820025b69a91a3547cbf8dfb4c2f1c69cfc (patch) | |
| tree | 4f578ba00cf9d0cb012dc6465b315d1d7f0d83c7 /ice40 | |
| parent | b582ba810cc54282d4c574bee80a7339c8da17f9 (diff) | |
| download | nextpnr-5b993820025b69a91a3547cbf8dfb4c2f1c69cfc.tar.gz nextpnr-5b993820025b69a91a3547cbf8dfb4c2f1c69cfc.tar.bz2 nextpnr-5b993820025b69a91a3547cbf8dfb4c2f1c69cfc.zip | |
ice40: cmake: fix build with pregenerated bba path
When building using non-pregenerated bba files, the rule to create bbasm
files gets called twice: once unconditionally, and once as part of the
conditional that determines we're not using a pregenerated bba path.
If we _are_ using a pregenerated bba path, then this rule gets called
anyway, resulting in a build error.
Remove the duplicate, unconditional creation of the bba file generation,
to fix the build when using pregenerated files, and to speed up the
build when not using pregenerated files.
Signed-off-by: Sean Cross <sean@xobs.io>
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/family.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ice40/family.cmake b/ice40/family.cmake index f22883fb..e31fce2d 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -40,14 +40,6 @@ if (NOT EXTERNAL_CHIPDB) set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bin) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) - add_custom_command(OUTPUT ${DEV_CC_BBA_DB} - COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -p ${DEV_CONSTIDS_INC} -g ${DEV_GFXH} ${OPT_FAST} ${OPT_SLOW} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB} - DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} ${PREV_DEV_CC_BBA_DB} - ) - add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB} - DEPENDS bbasm ${DEV_CC_BBA_DB} - ) if(PREGENERATED_BBA_PATH) add_custom_command(OUTPUT ${DEV_CC_DB} |