From 14524ad0193cf72d7ac78245fbccb2643e4da1d0 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 5 Dec 2022 16:49:32 -0500 Subject: [PATCH] Meta: Explicitly link generated compile-time data into the WASM JS REPL Without this, we were in a weird state where LibTimeZone believed it had TZDB data, but that data wasn't actually available to it. This caused functions like JS::get_named_time_zone_offset_nanoseconds() to trip an assertion when entering "new Date();" into the REPL. --- Meta/Lagom/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 4159c3095b..b6be033f5d 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -476,7 +476,7 @@ if (BUILD_LAGOM) target_link_libraries(js LibCrypto LibJS LibLine LibLocale LibMain LibTextCodec Threads::Threads) if (EMSCRIPTEN) add_executable(libjs Wasm/js_repl.cpp) - target_link_libraries(libjs LibJS) + target_link_libraries(libjs LibJS LibLocale LibTimeZone LibUnicode) target_link_options(libjs PRIVATE -sEXPORTED_FUNCTIONS=_initialize_repl,_execute -sEXPORTED_RUNTIME_METHODS=allocateUTF8 @@ -703,7 +703,7 @@ if (BUILD_LAGOM) if (APPLE) if("arm64" IN_LIST CMAKE_OSX_ARCHITECTURES AND "x86_64" IN_LIST CMAKE_OSX_ARCHITECTURES) set(CPACK_SYSTEM_NAME "macOS-universal2") - else() + else() set(CPACK_SYSTEM_NAME "macOS-${CMAKE_SYSTEM_PROCESSOR}") endif() else()