Skip to content

Commit

Permalink
Fix CircleCI build failure (#190)
Browse files Browse the repository at this point in the history
Summary:
There were two issues preventing the build from completing:

* `hermes-repl` requires `-ltinfo`
* `hermes::IsTriviallyCopyable<PseudoHandle<T>>` static_assert fails on Windows
Pull Request resolved: #190

Test Plan: CircleCI

Reviewed By: tmikov

Differential Revision: D20176642

Pulled By: willholen

fbshipit-source-id: 966acf91afbaca6469dd8f522d92c4b4fb47c981
  • Loading branch information
willholen authored and facebook-github-bot committed Mar 2, 2020
1 parent 573977a commit 6d67507
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/hermes/VM/CallResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ template <typename T>
class CallResult<PseudoHandle<T>, detail::CallResultSpecialize::PseudoHandle> {
PseudoHandle<T> valueOrStatus_;

#ifdef NDEBUG
#if defined(NDEBUG) && !defined(_WINDOWS)
static_assert(
hermes::IsTriviallyCopyable<PseudoHandle<T>, true>::value,
"PseudoHandle<T> must be trivially copyable");
Expand Down
5 changes: 3 additions & 2 deletions tools/repl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
# LICENSE file in the root directory of this source tree.

find_library(LIBREADLINE_FOUND readline)
find_library(LIBTINFO_FOUND tinfo)

if(LIBREADLINE_FOUND)
if(LIBREADLINE_FOUND AND LIBTINFO_FOUND)
set(HAVE_LIBREADLINE 1)
set(LIBREADLINE ${LIBREADLINE_FOUND})
set(LIBREADLINE ${LIBREADLINE_FOUND} ${LIBTINFO_FOUND})
endif()

configure_file(ReplConfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/ReplConfig.h
Expand Down

0 comments on commit 6d67507

Please sign in to comment.