Stop applying dylib fix since Langkit now does it

Author: eliericha

scripts/build_als.sh

@@ -167,22 +167,8 @@ function build_langkit_raw() {
       sed -i.bak -e 's/GPR_BUILD/GPR_LIBRARY_TYPE/' ./langkit/libmanage.py
       pip install .
 
-      # On macOS, the full path of gnat.adc is stored in ALI files with case
-      # normalization. Upon re-runs, gprbuild is unable to match the
-      # normalized path with a non-case-normalized real path. This causes
-      # unnecessary recompilations at every run.
-      #
-      # To avoid that, we use the -gnateb flag which tells GNAT to not use
-      # an absolute path for gnat.adc
       python manage.py make --no-mypy --generate-auto-dll-dirs \
-         --library-types=relocatable --gargs "-m -v -cargs:ada -gnateb"
-
-      if [[ $NODE_ARCH_PLATFORM = *darwin* ]]; then
-         find . -name '*.dylib' -print0 |
-            while IFS= read -r -d '' lib; do
-               fix_dylib_rpaths "$lib"
-            done
-      fi
+         --library-types=relocatable --gargs="-m -j0 -vh"
 
       # Export the environment needed to use langkit into a file for later
       # usage
@@ -230,9 +216,16 @@ function fix_dylib_rpaths() {
 
 # Run build_langkit_raw in Alire environment
 function build_langkit() {
-   # We use 'alr exec' to benefit from Alire setting up GPR_PROJECT_PATH with
-   # all the dependencies.
-   alr exec bash -- -x "$0" build_langkit_raw
+   (
+      # The langkit build will try to import liblktlang at the end. For that
+      # to work, all dependency libraries must be visible on
+      # [[DY]LD_LIBRARY_]PATH. This function takes care of that.
+      add_unpinned_deps_dlls_to_runtime_path
+
+      # We use 'alr exec' to benefit from Alire setting up GPR_PROJECT_PATH with
+      # all the dependencies.
+      alr exec bash -- -x "$0" build_langkit_raw
+   )
 }
 
 # This function adds the paths of DLLs from GCC installation and the Alire deps
@@ -272,22 +265,39 @@ function add_unpinned_deps_dlls_to_runtime_path() {
    export PATH=$NEW_PATH":$PATH"
 }
 
+# This is a utility function to run a command line within an environment where
+# the Langkit 'lkt' library is available.
+#
+# e.g. lkt_run python -c 'import liblktlang'
+#
+# Currently it is unused because on macOS spawning processes through a chain of
+# lkt_run --> alr --> bash does not allow inheriting DYLD_LIBRARY_PATH and
+# doesn't allow the libraries to be found.
+function lkt_run() {
+   python -m langkit.scripts.lkm run --config "$ROOT/subprojects/langkit_support/lkt/langkit.yaml" -- "${@}"
+}
+
 # Build ALS with alire
 function build_als() {
    add_unpinned_deps_dlls_to_runtime_path
 
    # Check that we can use langkit successfully
    (
       source "$LANGKIT_SETENV"
+
+      # Log environments for debugging
+      python -c 'import os; print("\n".join(f"{k}={v}" for k, v in os.environ.items()))'
+      alr exec python -- -c 'import os; print("\n".join(f"{k}={v}" for k, v in os.environ.items()))'
+
       # On Windows it is not enough to source the langkit env and unpinned
       # deps. The libraries of pinned Alire dependencies (not under
-      # alire/cache/dependencies) must also be made visible.
+      # alire/cache/dependencies) must also be made visible by calling 'alr exec'
       alr exec python -- -c 'import liblktlang; print("Imported liblktlang successfully")'
    )
 
    # We use 'alr exec' to benefit from Alire setting up GPR_PROJECT_PATH with
    # all the dependencies.
-   LIBRARY_TYPE=static STANDALONE=no alr exec make -- "VERSION=$TAG" all
+   LIBRARY_TYPE=static STANDALONE=no alr exec make -- "VERSION=$TAG" "GPRBUILD_CARGS=-m -vh" all
 }
 
 function test_als() {
@@ -427,6 +437,10 @@ strip_debug)
    strip_debug
    ;;
 
+fix_dylib_rpaths)
+   fix_dylib_rpaths "$2"
+   ;;
+
 *)
    echo "Unrecognized step: $STEP"
    exit 1