]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Reduced generated sized on macOS (and other envs where realpath is missing)
authorCarl Woffenden <cwoffenden@gmail.com>
Mon, 18 May 2020 08:12:02 +0000 (10:12 +0200)
committerCarl Woffenden <cwoffenden@gmail.com>
Mon, 18 May 2020 08:12:02 +0000 (10:12 +0200)
Added Python fallback for when realpath fails.

contrib/single_file_libs/combine.sh

index 05c7bce8e5cb8c237f99046164d6c5218fb99959..8eac4f9eb147a041aa0b8bfe1338f9ef982407da 100755 (executable)
@@ -93,6 +93,12 @@ resolve_include() {
         echo "$relpath"
         return 0
       fi
+      # Fallback on Python to reduce the path if the above fails.
+      local relpath=$(python -c "import os,sys; print os.path.relpath(sys.argv[1])" "$root/$inc" 2>/dev/null)
+      if [ "$relpath" != "" ]; then # not all distros have realpath...
+        echo "$relpath"
+        return 0
+      fi
       # Worst case, fall back to just the root + relative include path. The
       # problem with this is that it is possible to emit multiple different
       # resolved paths to the same file, depending on exactly how its included.