cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adds EMSCRIPTEN preprocessor definition to libsolidity build & avoid accessing filesystem::current_path() if building for Emscripten.

Browse Source
This commit is contained in:
Christian Parpart 2022-03-14 16:52:33 +01:00
parent ec6f1758c1
commit 3572d52ace
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/CMakeLists.txt
View File

@ -176,3 +176,7 @@ set(sources
add_library(solidity ${sources}) add_library(solidity ${sources})
target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only) target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only)
if(EMSCRIPTEN)
target_compile_definitions(solidity PRIVATE EMSCRIPTEN=1)
endif()

8
libsolidity/interface/FileReader.cpp
View File

@ -244,7 +244,13 @@ boost::filesystem::path FileReader::normalizeCLIPathForVFS(
// - Preserves case. Even if the filesystem is case-insensitive but case-preserving and the // - Preserves case. Even if the filesystem is case-insensitive but case-preserving and the
// case differs, the actual case from disk is NOT detected. // case differs, the actual case from disk is NOT detected.
boost::filesystem::path canonicalWorkDir = boost::filesystem::weakly_canonical(boost::filesystem::current_path()); boost::filesystem::path canonicalWorkDir =
#if defined(EMSCRIPTEN)
boost::filesystem::path("/")
#else
boost::filesystem::weakly_canonical(boost::filesystem::current_path())
#endif
;
// NOTE: On UNIX systems the path returned from current_path() has symlinks resolved while on // NOTE: On UNIX systems the path returned from current_path() has symlinks resolved while on
// Windows it does not. To get consistent results we resolve them on all platforms. // Windows it does not. To get consistent results we resolve them on all platforms.