Skip to content

changes for the mac + slimmer microhs distribution mouting #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DerThorsten wants to merge 19 commits into
base: main
Choose a base branch
from
+776 −790
Draft

changes for the mac + slimmer microhs distribution mouting #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d9289dc
wip
DerThorsten Mar 30, 2026
d29ca24
changes
DerThorsten Mar 30, 2026
e4c5cbb
changes
DerThorsten Mar 30, 2026
30598e3
changes
DerThorsten Mar 30, 2026
0e4afb6
changes
DerThorsten Mar 30, 2026
9bb8bb5
changes
DerThorsten Mar 30, 2026
98913e5
changes
DerThorsten Mar 30, 2026
f31a990
changes
DerThorsten Mar 30, 2026
418a927
changes
DerThorsten Mar 30, 2026
7773937
changes
DerThorsten Mar 30, 2026
77cb306
changes
DerThorsten Mar 30, 2026
809fbae
changes
DerThorsten Mar 30, 2026
0086255
changes
DerThorsten Mar 30, 2026
3dbd190
changes
DerThorsten Mar 30, 2026
256057c
changes
DerThorsten Mar 30, 2026
108b52b
changes
DerThorsten Mar 30, 2026
acdd3e6
reset lockfile
DerThorsten Mar 30, 2026
cd0b1d5
update?
DerThorsten Mar 30, 2026
db85106
update?
DerThorsten Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ endif()
# Dependencies
# ============

set(xeus_REQUIRED_VERSION "5.0.0" CACHE STRING "Minimum xeus version required to build xeus-haskell")
set(xeus_REQUIRED_VERSION "6.0.0" CACHE STRING "Minimum xeus version required to build xeus-haskell")

find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED)

Expand Down Expand Up @@ -316,9 +316,9 @@ if(EMSCRIPTEN)
xeus_wasm_link_options(xhaskell "web,worker")
target_link_options(xhaskell
PUBLIC "SHELL: -Wno-version-check"
PUBLIC "SHELL: -sWASMFS"
PUBLIC "SHELL: --pre-js ${CMAKE_CURRENT_SOURCE_DIR}/src/pre.js"
PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/src/post.js"
# PUBLIC "SHELL: -sWASMFS"
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/MicroHs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function(fetch_and_build_microhs MICROHS_BIN MICROHS_SRC_DIR)
endif()

if(EMSCRIPTEN)
set(HOST_ENV "EMSCRIPTEN=1" "CC=gcc" "CXX=g++" "LD=ld")
set(HOST_ENV "EMSCRIPTEN=1" "CC=gcc" "LD=ld")
else()
set(HOST_ENV "EMSCRIPTEN=0")
endif()
Expand Down
Loading
Loading