Fix feature flags for make-build-wasmer-headless #3483

fschutt · 2023-01-17T09:31:42Z

Fixes master being red

lib/cli/Cargo.toml

lib/wasi/Cargo.toml

Co-authored-by: Syrus Akbary <[email protected]>

lib/wasi/Cargo.toml

Cargo.toml

lib/wasi/src/runners/wasi.rs

lib/c-api/Cargo.toml

lib/api/src/sys/store.rs

fschutt · 2023-01-19T13:00:59Z

The bug disappears if I set the Engine::new(compiler_config, target, features) in lib/compiler/src/engine/builder.rs:65 to change the target.operating_system = OperatingSystem::Darwin instead of OperatingSystem::Windows (alternative, removing EngineBuilder::new().set_target(Some(...)) also works.

See #3508

This reverts commit 6398b06.

This reverts commit 32fbfc3.

fschutt · 2023-01-19T16:26:54Z

I've filed a bug in #3508 and worked around this problem for now.

lib/wasi/src/runners/emscripten.rs

lib/compiler/src/engine/artifact.rs

lib/cli/src/commands/create_exe.rs

lib/cli/src/store.rs

syrusakbary

Once the last nits are fixed, we should be good to merge

Fix feature flags for make-build-wasmer-headless

1cb29bb

fschutt requested a review from syrusakbary as a code owner January 17, 2023 09:31

ptitSeb reviewed Jan 17, 2023

View reviewed changes

lib/cli/Cargo.toml Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 17, 2023

View reviewed changes

lib/wasi/Cargo.toml Outdated Show resolved Hide resolved

fschutt and others added 9 commits January 17, 2023 19:39

Disable compilers in wasi/Cargo.toml

a674471

Co-authored-by: Syrus Akbary <[email protected]>

Disable compiler feature for headless-minimal again.

9091054

Co-authored-by: Syrus Akbary <[email protected]>

Remove dependency on wasmer/compiler from webc-runner

71fdf26

Allow unused variables

8715e22

Minimize dependencies of wasmer-headless build

1ca0de8

Fix headless-minimal properly

0678e90

Fix make lint

e2755b7

Fix make lint

912f21a

Adjust feature flags

8183474

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/wasi/Cargo.toml Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 18, 2023

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/wasi/src/runners/wasi.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/c-api/Cargo.toml Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/c-api/Cargo.toml Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/c-api/Cargo.toml Outdated Show resolved Hide resolved

fschutt force-pushed the fix-master-red-2 branch from 35b3747 to 8183474 Compare January 18, 2023 09:34

Address review comments

a483d04

fschutt enabled auto-merge January 18, 2023 09:47

fschutt force-pushed the fix-master-red-2 branch from 5f38cc9 to a483d04 Compare January 18, 2023 10:46

fschutt added 3 commits January 18, 2023 12:21

Fix feature flags and misleading error message

a70a492

Revert changes to Store::default and remove Store::headless again

9c05248

Fix make lint

7008023

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/api/src/sys/store.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 18, 2023

View reviewed changes

lib/api/src/sys/store.rs Show resolved Hide resolved

fschutt commented Jan 18, 2023

View reviewed changes

lib/api/src/sys/store.rs Outdated Show resolved Hide resolved

Revert error message text

caeca9a

fschutt added 2 commits January 19, 2023 12:46

Fix more errors on Windows

b7c868e

Store::default - create new store with BaseTunables

c61a5d7

fschutt force-pushed the fix-master-red-2 branch from 3934693 to c61a5d7 Compare January 19, 2023 12:11

fschutt added 5 commits January 19, 2023 15:41

Disable set_target(Some(target)) for Engine builder

32fbfc3

See #3508

Enable set_target() again, but disable unwind info

6398b06

Revert "Enable set_target() again, but disable unwind info"

f577164

This reverts commit 6398b06.

Revert "Disable set_target(Some(target)) for Engine builder"

e112604

This reverts commit 32fbfc3.

Refactor Artifact::new into separate sub-functions

17943e5

fschutt and others added 2 commits January 19, 2023 18:53

Merge branch 'master' into fix-master-red-2

533b72f

Remove unnecessary printlns

32b39e8

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/wasi/src/runners/emscripten.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/compiler/src/engine/artifact.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/compiler/src/engine/artifact.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/commands/create_exe.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/commands/create_exe.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/store.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/store.rs Outdated Show resolved Hide resolved

fschutt added 4 commits January 19, 2023 19:33

Fix wrong documentation

af67c86

Move get_module_info into the Engine

b26b487

Undo Store::new_with_tunables debugging code

54f0f0c

Always import ModuleInfo

c1fec2f

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/store.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/store.rs Outdated Show resolved Hide resolved

syrusakbary reviewed Jan 19, 2023

View reviewed changes

lib/cli/src/store.rs Outdated Show resolved Hide resolved

syrusakbary approved these changes Jan 19, 2023

View reviewed changes

Make CompilerOptions flags private again

ff11cbd

fschutt merged commit d329044 into master Jan 19, 2023

fschutt deleted the fix-master-red-2 branch January 19, 2023 19:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix feature flags for make-build-wasmer-headless #3483

Fix feature flags for make-build-wasmer-headless #3483

fschutt commented Jan 17, 2023

fschutt commented Jan 19, 2023

fschutt commented Jan 19, 2023

syrusakbary left a comment

Fix feature flags for make-build-wasmer-headless #3483

Fix feature flags for make-build-wasmer-headless #3483

Conversation

fschutt commented Jan 17, 2023

fschutt commented Jan 19, 2023

fschutt commented Jan 19, 2023

syrusakbary left a comment

Choose a reason for hiding this comment