Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions packages/std/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pedantic = { level = "warn", priority = -1 }
result_large_err = "allow"

[workspace.dependencies]
bytes = { version = "1", features = ["serde"] }
clap = { version = "4", features = ["derive"] }
fnv = "1"
futures = "0.3"
Expand All @@ -35,6 +36,7 @@ libc = "0.2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "58527c57de3217c82d0c54e3dacaba6394245fec" }
tangram_serialize = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "58527c57de3217c82d0c54e3dacaba6394245fec" }
tempfile = "3"
tokio = { version = "1", default-features = false, features = [
"rt",
Expand Down Expand Up @@ -77,12 +79,16 @@ path = "packages/std/lib.rs"
workspace = true

[dependencies]
bytes = { workspace = true }
futures = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
tangram_client = { workspace = true }
tangram_serialize = { workspace = true }
tempfile = { workspace = true }
tracing = { workspace = true, optional = true }
tracing-subscriber = { workspace = true, optional = true }

[features]
tracing = ["dep:tracing", "dep:tracing-subscriber"]
default = ["tracing"]
11 changes: 10 additions & 1 deletion packages/std/bootstrap/make.tg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ export const source = () => {

export type Arg = {
host?: string;
embedWrapper?: boolean | undefined;
};

export const build = async (arg?: Arg) => {
const host = arg?.host ?? (await std.triple.host());
const embedWrapper = arg?.embedWrapper ?? true;

const configure = {
args: ["--disable-dependency-tracking"],
Expand All @@ -48,7 +50,14 @@ export const build = async (arg?: Arg) => {
install,
};

const env = std.env.arg(sdk(host), { utils: false });
let envArgs: Array<tg.Unresolved<std.env.Arg>> = [
sdk(host),
{ utils: false },
];
if (embedWrapper) {
envArgs.push({ TGLD_EMBED_WRAPPER: true });
}
const env = std.env.arg(...envArgs);

const output = await autotoolsInternal({
bootstrap: true,
Expand Down
Loading