Skip to content

Commit

Permalink
LuaJIT: Fix WITH_AMALG option failing during parallel builds
Browse files Browse the repository at this point in the history
Addresses the "'fold_hash' undeclared" compile errors in luvit/luvi#225

See also torch/luajit-rocks#39
  • Loading branch information
squeek502 committed Jan 29, 2020
1 parent 40b5fa7 commit a88f05d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions deps/luajit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,15 @@ IF(WIN32)
ELSE()
IF(WITH_AMALG)
add_executable(luajit ${LUAJIT_DIR}/src/luajit.c ${LUAJIT_DIR}/src/ljamalg.c ${DEPS})
# When using WITH_AMALG during a parallel build, its possible to run into
# false-positive "error: 'fold_hash' undeclared" compile errors due to a weird interaction
# when building two ljamalg.c at the same time.
#
# This adds a fake dependency from one to the other, forcing the build process to
# compile them sequentially rather than parallel.
#
# See https://github.com/torch/luajit-rocks/issues/39
add_dependencies(luajit luajit-5.1)
ELSE()
add_executable(luajit ${LUAJIT_DIR}/src/luajit.c ${SRC_LJCORE} ${DEPS})
ENDIF()
Expand Down

0 comments on commit a88f05d

Please sign in to comment.