Try to restore some build system conventions in a low-impact way #270

Ericson2314 · 2022-03-16T18:24:57Z

Fixes #269

The "don't move the variables independently if you want to make install" part is a gross, but as neither wasi-sdk or Nixpkgs actually
needs make install (we both can just build right into the directories
we want) I figured it wasn't actually so heinous in practice.

sbc100 · 2022-03-16T18:46:41Z

Seems reasonable.

I wonder if we should just remove the install target if its not being used anywhere (and therefore untested).

sbc100 · 2022-03-16T18:47:35Z

I don't the github actions running here... any idea whats up with that?

sbc100 · 2022-03-16T18:50:29Z

Looks like github actions might be down/struggling: https://www.githubstatus.com/

sunfishcode · 2022-03-16T20:26:45Z

Makefile


 # Set the target.
-CFLAGS = $(WASM_CFLAGS) --target=$(TARGET_TRIPLE)
+CFLAGS += --target=$(TARGET_TRIPLE)


If someone overwrites CFLAGS on the make command line, does it override the --target=$(TARGET_TRIPLE) part too, or just the -O2 -DNDEBUG part?

I think just the O2 -DNDEBUG part, but will check.

@sunfishcode I tested it, and it indeed the CLI was overriding everything. I added a bunch of override so that this is no longer the case, and just the -O2 -DNDEBUG part gets overridden.

Makefile

sunfishcode · 2022-03-18T16:36:50Z

The CI failure has errors like "cc: error: unrecognized command line option ‘--target=wasm32-wasi’"; it looks like it's using the host cc.

Ericson2314 · 2022-03-19T19:32:55Z

Oops forgot about CI and the README too. I did a grep and there should be no more pesky WASM_ at all, now.

sunfishcode · 2022-03-21T20:54:14Z

The CI is now getting "fatal error: 'wasi/api.h' file not found" errors, and it's not immediately obvious what the problem is.

Ericson2314 · 2022-03-21T21:38:52Z

@sunfishcode I think I am using -isystem, but we in Nixpkgs were getting that error before too, and hacked around it. I tried various things, but nothing is making sense, so I messaged for help in the Zulip.

.github/workflows/main.yml

This is less of a sledgehammer, and prepares the way for WebAssembly#270.

This is less of a sledgehammer, and prepares the way for #270.

Progress towards WebAssembly#270

Fixes WebAssembly#269 The "don't move the variables independently if you want to `make install`" part is a gross, but as neither `wasi-sdk` or Nixpkgs actually needs `make install` (we both can just build right into the directories we want) I figured it wasn't actually so heinous in practice. Also reorganize the the github actions CI slightly.

Ericson2314 · 2022-03-23T02:48:45Z

Closing since I broke up into bits.

Progress towards WebAssembly#270

sunfishcode reviewed Mar 16, 2022

View reviewed changes

sbc100 reviewed Mar 16, 2022

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Ericson2314 force-pushed the standardize-build branch from 7657a2d to 000c9ec Compare March 17, 2022 15:29

sbc100 reviewed Mar 17, 2022

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Ericson2314 force-pushed the standardize-build branch from 000c9ec to 59008cc Compare March 17, 2022 15:53

Ericson2314 force-pushed the standardize-build branch from 59008cc to 1f11d55 Compare March 19, 2022 19:32

sbc100 approved these changes Mar 20, 2022

View reviewed changes

Ericson2314 force-pushed the standardize-build branch 4 times, most recently from 96808c1 to c28fd53 Compare March 21, 2022 22:23

Ericson2314 commented Mar 21, 2022

View reviewed changes

.github/workflows/main.yml Outdated Show resolved Hide resolved

Ericson2314 force-pushed the standardize-build branch from c28fd53 to 965088e Compare March 21, 2022 22:56

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Mar 21, 2022

Use -isystem instead of --sysroot for the installed headers

0052a1e

This is less of a sledgehammer, and prepares the way for WebAssembly#270.

Ericson2314 mentioned this pull request Mar 21, 2022

Use -isystem instead of --sysroot for the installed headers #273

Merged

sunfishcode pushed a commit that referenced this pull request Mar 21, 2022

Use -isystem instead of --sysroot for the installed headers

fc260f1

This is less of a sledgehammer, and prepares the way for #270.

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Mar 21, 2022

Allow varying the include, lib, and share dirs independently

d64c6b6

Progress towards WebAssembly#270

Ericson2314 force-pushed the standardize-build branch from 965088e to 040b95e Compare March 21, 2022 23:27

Ericson2314 mentioned this pull request Mar 21, 2022

Allow varying the include, lib, and share dirs independently #274

Closed

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Mar 21, 2022

Do more explicit env vars for CI

80b03bc

Progress towards WebAssembly#270

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Mar 22, 2022

Do more explicit env vars for CI

42b455d

Progress towards WebAssembly#270

Allow varying the include, lib, and share dirs independently

17a0865

Progress towards WebAssembly#270

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Mar 22, 2022

Do more explicit env vars for CI

cd8e202

Progress towards WebAssembly#270

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Mar 22, 2022

Do more explicit env vars for CI

117a5b8

Progress towards WebAssembly#270

Do more explicit env vars for CI

2136cfc

Progress towards WebAssembly#270

Ericson2314 mentioned this pull request Mar 22, 2022

Use standardized CC, AR, NM env vars #275

Merged

Ericson2314 added 2 commits March 22, 2022 02:07

Merge branch 'more-explicit-ci-vars' into HEAD

0f316c0

Ericson2314 force-pushed the standardize-build branch from 040b95e to 68cfb34 Compare March 22, 2022 02:09

Ericson2314 closed this Mar 23, 2022

Ericson2314 deleted the standardize-build branch March 23, 2022 02:48

Ericson2314 added a commit to Ericson2314/wasi-libc that referenced this pull request Apr 12, 2022

Allow varying the include, lib, and share dirs independently

2f44207

Progress towards WebAssembly#270

Try to restore some build system conventions in a low-impact way #270

Try to restore some build system conventions in a low-impact way #270

Uh oh!

Conversation

Ericson2314 commented Mar 16, 2022

Uh oh!

sbc100 commented Mar 16, 2022

Uh oh!

sbc100 commented Mar 16, 2022

Uh oh!

sbc100 commented Mar 16, 2022

Uh oh!

sunfishcode Mar 16, 2022

Choose a reason for hiding this comment

Uh oh!

Ericson2314 Mar 16, 2022

Choose a reason for hiding this comment

Uh oh!

Ericson2314 Mar 17, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sunfishcode commented Mar 18, 2022

Uh oh!

Ericson2314 commented Mar 19, 2022

Uh oh!

sunfishcode commented Mar 21, 2022

Uh oh!

Ericson2314 commented Mar 21, 2022

Uh oh!

Uh oh!

Ericson2314 commented Mar 23, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants