consequences of llvm/gcc getting cc symlinks (#181)

Author: mxcl

.github/workflows/ci.yml

@@ -35,9 +35,6 @@ jobs:
       - run: pkg build ${{matrix.pkgs}}
         id: build
 
-      - if: always()
-        run: cat ${{ steps.build.outputs.build-dir }}/config.log || true
-
       - run: test -n '${{ steps.build.outputs.pkgs }}'
       - run: test -n '${{ steps.build.outputs.relative-paths }}'
 

bin/pkg-build

@@ -1,6 +1,8 @@
-#!/usr/bin/env -S pkgx bash -eo pipefail
+#!/usr/bin/env -S pkgx bash
 # shellcheck shell=bash
 
+set -eo pipefail
+
 PKGX_DIR=${PKGX_DIR:-"$HOME/.pkgx"}
 
 if pwd | grep -q ' '; then
@@ -32,7 +34,7 @@ if test -n "$PKGX_DOCKER"; then
   exec "$d"/bin/pkg-docker build "$PKGS"
 fi
 
-if ! available.ts "$PKGS"; then
+if ! available.ts $PKGS; then
   echo "warning: not supported on current platform" >&2
   exit 0
 fi

bin/pkg-clean

@@ -1,6 +1,8 @@
-#!/usr/bin/env -S pkgx bash -eo pipefail
+#!/usr/bin/env -S pkgx bash
 # shellcheck shell=bash
 
+set -eo pipefail
+
 d="$(cd "$(dirname "$0")"/.. && pwd)"
 PATH="$d/libexec:$PATH"
 

bin/pkg-docker

@@ -18,7 +18,7 @@ if test "$arg0" = docker; then
   exit 1
 elif shift; then
   # ensure this brewkit is used
-  CMD="pkgx +deno.land ""$d/bin/pkg-$arg0"
+  CMD="$d/bin/pkg-$arg0"
   ADDARGS="--volume ""$d"":""$d"
 else
   # we were invoked as `pkg -L` by itself

bin/pkg-edit

@@ -1,7 +1,7 @@
-#!/usr/bin/env -S pkgx bash -eo pipefail
+#!/usr/bin/env -S pkgx bash
 # shellcheck shell=bash
 
-set -e
+set -eo pipefail
 
 d="$(cd "$(dirname "$0")"/.. && pwd)"
 PATH="$d/libexec:$PATH"

bin/pkg-fetch

@@ -1,6 +1,8 @@
-#!/usr/bin/env -S pkgx bash -eo pipefail
+#!/usr/bin/env -S pkgx bash
 # shellcheck shell=bash
 
+set -eo pipefail
+
 d="$(cd "$(dirname "$0")"/.. && pwd)"
 PATH="$d/libexec:$PATH"
 

bin/pkg-fixup

@@ -1,6 +1,8 @@
-#!/usr/bin/env -S pkgx bash -eo pipefail
+#!/usr/bin/env -S pkgx bash
 # shellcheck shell=bash
 
+set -eo pipefail
+
 d="$(cd "$(dirname "$0")"/.. && pwd)"
 PATH="$d/libexec:$PATH"
 

bin/pkg-test

@@ -1,6 +1,8 @@
-#!/usr/bin/env -S pkgx bash -eo pipefail
+#!/usr/bin/env -S pkgx bash
 # shellcheck shell=bash
 
+set -eo pipefail
+
 d="$(cd "$(dirname "$0")"/.. && pwd)"
 PATH="$d/libexec:$PATH"
 

libexec/find.ts

@@ -1,10 +1,13 @@
 #!/usr/bin/env -S pkgx deno run --allow-read --allow-env
 
-import { hooks } from "pkgx"
+import { hooks, utils } from "pkgx"
 const { find } = hooks.usePantry()
 
 for (const arg of Deno.args) {
-  const rv = await find(arg)
+
+  const {project, constraint} = utils.pkg.parse(arg)
+
+  const rv = await find(project)
 
   if (rv.length > 1) {
     console.error("multiple matches: " + rv.map(({project}) => project).join(' '))
@@ -18,6 +21,7 @@ for (const arg of Deno.args) {
   if (Deno.env.get("_PATHS")) {
     console.info(rv[0].path.string)
   } else {
-    console.info(rv[0].project)
+    const pkg = {project: rv[0].project, constraint}
+    console.info(utils.pkg.str(pkg))
   }
 }

libexec/stage-test.ts

@@ -3,6 +3,7 @@
 import { parseFlags } from "cliffy/flags/mod.ts"
 import { hooks, utils, Path } from "pkgx"
 import undent from "outdent"
+import host from "libpkgx/utils/host.ts";
 
 const { usePantry, useCellar, useConfig, useShellEnv } = hooks
 const { pkg: pkgutils, panic } = utils
@@ -31,10 +32,20 @@ const deps = await (() => {
   return Promise.all(pp)
 })()
 const dstdir = new Path(flags.dstdir)
-const yml = await pantry.project(pkg).yaml()
+const project = pantry.project(pkg)
+const yml = await project.yaml()
 const installations = [...deps]
 if (deps.find(x => x.pkg.project == self.pkg.project) === undefined) installations.push(self)
 
+/// try to find `pkgx` since we deliberately withold it from the PATH for tests
+/// since it needs to be an explicit dependency
+const pkgx = (PATH => {
+  for (const path of PATH.split(":")) {
+    const f = Path.abs(path)?.join("pkgx").isExecutableFile()
+    if (f) return f.string
+  }
+})(Deno.env.get("PATH") ?? '') ?? 'pkgx'
+
 Deno.env.set("HOME", dstdir.string)  //lol side-effects beware!
 const env = await useShellEnv().map({ installations })
 
@@ -43,44 +54,20 @@ if (!yml.test) throw "no `test` node in package.yml"
 env['PATH'] ??= []
 env['PATH'].push("/usr/bin:/bin")
 
-if (!deps.find(({pkg}) => pkg.project == 'llvm.org' || pkg.project == 'gnu.org/gcc')) {
-  /// add our helper cc toolchain unless the package has picked its own toolchain
-  env['PATH'].unshift(new Path(new URL(import.meta.url).pathname).parent().parent().join("share/toolchain/bin").string)
-
-  //COPY PASTA from stage.ts
-  const d = dstdir.join('dev.pkgx.bin').mkdir()
-  const symlink = (names: string[], {to}: {to: string}) => {
-    for (const name of names) {
-      const path = d.join(name)
-      if (path.exists()) continue
-      const target = useConfig().prefix.join('llvm.org/v*/bin', to)
-      path.ln('s', { target })
-    }
-  }
-
-  symlink(["ar"], {to: "llvm-ar"})
-  symlink(["as"], {to: "llvm-as"})
-  symlink(["cc", "gcc", "clang"], {to: "clang"})
-  symlink(["c++", "g++", "clang++"], {to: "clang++"})
-  symlink(["cpp"], {to: "clang-cpp"})
-  symlink(["ld"], {to: "lld"})
-  symlink(["lld"], {to: "lld"})
-  symlink(["ld64.lld"], {to: "ld64.lld"})
-  symlink(["lld-link"], {to: "lld-link"})
-  symlink(["objcopy"], {to: "llvm-objcopy"})
-  symlink(["readelf"], {to: "llvm-readelf"})
-  symlink(["strip"], {to: "llvm-strip"})
-  symlink(["nm"], {to: "llvm-nm"})
-  symlink(["ranlib"], {to: "llvm-ranlib"})
-  symlink(["strings"], {to: "llvm-strings"})
-}
-
 let text = undent`
-  #!/usr/bin/env bash
-
-  set -e
-  set -o pipefail
-  set -x
+  #!/usr/bin/env -S pkgx bash
+
+  set -exo pipefail
+
+  command_not_found_handle() {
+    echo "::warning::\\\`$1\\\` is not an explicit dependency!"
+    case $1 in
+    cc|c++|ld)
+      ${pkgx} +llvm.org -- "$@";;
+    *)
+      ${pkgx} -- "$@";;
+    esac
+  }
 
   export PKGX_DIR="${useConfig().prefix}"
   export HOME="${dstdir}"