Skip to content

Commit 2a8f83f

Browse files
committed
wip
1 parent 125e486 commit 2a8f83f

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

bin/pkg-ls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export default function *ls() {
2727
const set = new Set();
2828
for (const project of projects) {
2929
if (project == "deno.com") continue;
30+
if (project == "rustup.rs") continue;
3031
if (set.has(project)) continue;
3132
set.add(project);
3233
if (Deno.args.includes("--platforms=all") || builds_on_this_platform(project)) {

brewkit/fixups/Stripper.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ export default class Stripper {
1919
const strip = Deno.build.os == "linux" ? `${Deno.env.get("PKGX_BIN")}/strip` : "strip";
2020
for (const path of this.paths) {
2121
if (path.string.endsWith(".dylib") || /\.so(\.\d)*$/.test(path.string)) {
22-
run`strip -x ${path}`;
22+
run`${strip} -x ${path}`;
2323
} else if (path.basename().startsWith("perl")) {
2424
// perl uses symbols in itself for its modules
2525
//FIXME should be easy to override default fixups and exclude this
26-
run`strip -x ${path}`;
26+
run`${strip} -x ${path}`;
2727
} else if (Deno.build.os == "darwin") {
28-
run`strip -u -r ${path}`;
28+
run`${strip} -u -r ${path}`;
2929
} else {
30-
run`strip -Ss ${path}`;
30+
run`${strip} -Ss ${path}`;
3131
}
3232
}
3333
}

projects/erlang.org/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default async function ({ prefix, version, deps, tag }: BuildOptions) {
1010

1111
if (Deno.build.os == "linux") {
1212
// ld.lld: error: undefined reference: __extendhfsf2
13-
Deno.env.set("LDFLAGS", "-Wl,--allow-shlib-undefined");
13+
extra = "LDFLAGS=-Wl,--allow-shlib-undefined";
1414
}
1515

1616
run`./configure

projects/llvm.org/build.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ export default async function build({ prefix, version, tag, deps }: BuildOptions
2222

2323
switch (Deno.build.os) {
2424
case "linux":
25-
env_include("llvm.org");
25+
// env_include("llvm.org");
2626

2727
//using lld speeds things up, the other keeps us GNU glibc by default
2828
platform_specific_cmake_args = `
2929
-DCLANG_DEFAULT_RTLIB=libgcc
3030
-DCLANG_DEFAULT_LINKER=lld
31+
-DDCLANG_DEFAULT_CXX_STDLIB=libstdc++
32+
-DCLANG_DEFAULT_UNWINDLIB=libgcc
33+
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON # needed to find gcc shit at runtime
3134
`;
3235

3336
// compiler-rt specific stuff
@@ -83,6 +86,8 @@ export default async function build({ prefix, version, tag, deps }: BuildOptions
8386
-DLLVM_ENABLE_Z3_SOLVER=OFF # required for ^^
8487
-DCLANG_ENABLE_ARCMT=OFF
8588
89+
-DLLVM_ENABLE_LIBCXX=OFF # seems weird but we don’t want this, we delegate to the system
90+
8691
${platform_specific_cmake_args}
8792
`;
8893

0 commit comments

Comments
 (0)