simplify(deno)

moving libunwind out of llvm should prevent unintended linkages.
This commit is contained in:
Jacob Heider 2024-06-04 14:28:57 -04:00 committed by Jacob Heider
parent 4dfba34c08
commit 07cddda32d

View file

@ -20,16 +20,6 @@ runtime:
build: build:
script: script:
# deno does not need llvm to build on darwin+x86-64, and if it is present,
# deno will be linked to its libunwind, which then causes deno to need llvm
# in runtime.
- |
if test "{{hw.platform}}+{{ hw.arch }}" != "darwin+x86-64"; then
set -o allexport
source <(pkgx +llvm.org^17)
set +o allexport
fi
- | - |
rust_version=$(yq -er .toolchain.channel rust-toolchain.toml) rust_version=$(yq -er .toolchain.channel rust-toolchain.toml)
if semverator lt "$rust_version" 1.67.0; then if semverator lt "$rust_version" 1.67.0; then
@ -70,6 +60,9 @@ build:
- cargo install --locked --path cli --root "{{ prefix }}" - cargo install --locked --path cli --root "{{ prefix }}"
dependencies: dependencies:
darwin:
llvm.org: '*'
# rust-lang.org: various
git-scm.org: 2 # to build tinycc git-scm.org: 2 # to build tinycc
curl.se: '*' # required to download v8 (python is another option) curl.se: '*' # required to download v8 (python is another option)
cmake.org: ^3 # deno.land>=1.36.1 requires cmake cmake.org: ^3 # deno.land>=1.36.1 requires cmake
@ -92,5 +85,12 @@ test:
if: '>=1.40.5' if: '>=1.40.5'
# tests download of dependencies # tests download of dependencies
- deno eval 'import { VERSION } from "https://deno.land/std@0.221.0/version.ts"; console.log(VERSION);' | tee /dev/stderr | grep -q ^0.221.0$ - deno eval 'import { VERSION } from "https://deno.land/std@0.221.0/version.ts"; console.log(VERSION);' | tee /dev/stderr | grep -q ^0.221.0$
# ensure we haven't linked libunwind
- if $LIST_LIBS {{prefix}}/bin/deno | grep libunwind; then false; fi
fixture: | fixture: |
console.log("Hello, world!"); console.log("Hello, world!");
env:
darwin:
LIST_LIBS: otool -l
linux:
LIST_LIBS: ldd