From 0bdf833901da08abfa4524b26c740285e72b2149 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 6 Nov 2019 22:58:04 +0100
Subject: [PATCH] Move tryrun out of cross to Unix Native build
 (dotnet/corefx#42411)

* Move tryrun out of cross to Unix Native build

* Add full path and delete android tryruns


Commit migrated from https://github.com/dotnet/corefx/commit/3c4cad0c2908ecbb63f390036b235cb0584ad5c8
---
 src/libraries/Native/Unix/gen-buildsys-clang.sh   | 15 ++++++++++++++-
 src/libraries/Native/Unix/gen-buildsys-gcc.sh     | 15 ++++++++++++++-
 src/libraries/{cross => Native/Unix}/tryrun.cmake |  0
 src/libraries/cross/android/arm/tryrun.cmake      |  9 ---------
 src/libraries/cross/android/arm64/tryrun.cmake    |  9 ---------
 5 files changed, 28 insertions(+), 20 deletions(-)
 rename src/libraries/{cross => Native/Unix}/tryrun.cmake (100%)
 delete mode 100644 src/libraries/cross/android/arm/tryrun.cmake
 delete mode 100644 src/libraries/cross/android/arm64/tryrun.cmake

diff --git a/src/libraries/Native/Unix/gen-buildsys-clang.sh b/src/libraries/Native/Unix/gen-buildsys-clang.sh
index a47a452..9a13eba 100755
--- a/src/libraries/Native/Unix/gen-buildsys-clang.sh
+++ b/src/libraries/Native/Unix/gen-buildsys-clang.sh
@@ -3,6 +3,19 @@
 # This file invokes cmake and generates the build system for Clang.
 #
 
+source="${BASH_SOURCE[0]}"
+
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
 if [ $# -lt 5 -o $# -gt 7 ]
 then
   echo "Usage..."
@@ -58,7 +71,7 @@ if [[ -n "$CROSSCOMPILE" ]]; then
         CONFIG_DIR=$repo_root/cross
     fi
     export TARGET_BUILD_ARCH=$build_arch
-    cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake"
+    cmake_extra_defines="$cmake_extra_defines -C $scriptroot/tryrun.cmake"
     cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake"
 fi
 if [ "$build_arch" == "armel" ]; then
diff --git a/src/libraries/Native/Unix/gen-buildsys-gcc.sh b/src/libraries/Native/Unix/gen-buildsys-gcc.sh
index 35b5ad7..f1ed766 100755
--- a/src/libraries/Native/Unix/gen-buildsys-gcc.sh
+++ b/src/libraries/Native/Unix/gen-buildsys-gcc.sh
@@ -3,6 +3,19 @@
 # This file invokes cmake and generates the build system for Gcc.
 #
 
+source="${BASH_SOURCE[0]}"
+
+# resolve $SOURCE until the file is no longer a symlink
+while [[ -h $source ]]; do
+  scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+  source="$(readlink "$source")"
+
+  # if $source was a relative symlink, we need to resolve it relative to the path where the
+  # symlink file was located
+  [[ $source != /* ]] && source="$scriptroot/$source"
+done
+scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+
 if [ $# -lt 5 ]
 then
   echo "Usage..."
@@ -129,7 +142,7 @@ if [ "$CROSSCOMPILE" = "1" ]; then
         CONFIG_DIR="$2/cross"
     fi
     export TARGET_BUILD_ARCH=$build_arch
-    cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake"
+    cmake_extra_defines="$cmake_extra_defines -C $scriptroot/tryrun.cmake"
     cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake"
     cmake_extra_defines="$cmake_extra_defines --sysroot=$ROOTFS_DIR"
     cmake_extra_defines="$cmake_extra_defines -DCLR_UNIX_CROSS_BUILD=1"
diff --git a/src/libraries/cross/tryrun.cmake b/src/libraries/Native/Unix/tryrun.cmake
similarity index 100%
rename from src/libraries/cross/tryrun.cmake
rename to src/libraries/Native/Unix/tryrun.cmake
diff --git a/src/libraries/cross/android/arm/tryrun.cmake b/src/libraries/cross/android/arm/tryrun.cmake
deleted file mode 100644
index aeaf7de..0000000
--- a/src/libraries/cross/android/arm/tryrun.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-SET( HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE
-     0
-     CACHE STRING "Result from TRY_RUN" FORCE)
-SET( HAVE_CLOCK_MONOTONIC_EXITCODE
-     0
-     CACHE STRING "Result from TRY_RUN" FORCE)
-SET( HAVE_CLOCK_REALTIME_EXITCODE
-     0
-     CACHE STRING "Result from TRY_RUN" FORCE)
diff --git a/src/libraries/cross/android/arm64/tryrun.cmake b/src/libraries/cross/android/arm64/tryrun.cmake
deleted file mode 100644
index aeaf7de..0000000
--- a/src/libraries/cross/android/arm64/tryrun.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-SET( HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP_EXITCODE
-     0
-     CACHE STRING "Result from TRY_RUN" FORCE)
-SET( HAVE_CLOCK_MONOTONIC_EXITCODE
-     0
-     CACHE STRING "Result from TRY_RUN" FORCE)
-SET( HAVE_CLOCK_REALTIME_EXITCODE
-     0
-     CACHE STRING "Result from TRY_RUN" FORCE)
-- 
2.7.4