[Tizen] Fix issue with return from non-sourced script if tools are already initialized

[platform/upstream/coreclr.git] / build.sh

diff --git a/build.sh b/build.sh
index f4a0a69..97e89be 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -75,9 +75,9 @@ initTargetDistroRid()
     # Only pass ROOTFS_DIR if cross is specified.
     if (( ${__CrossBuild} == 1 )); then
         passedRootfsDir=${ROOTFS_DIR}
-    elif [ "${__BuildArch}" != "${__HostArch}" ]; then
-        echo "Error, you are building a cross scenario without passing -cross."
-        exit 1
+    #elif [ "${__BuildArch}" != "${__HostArch}" ]; then
+    #    echo "Error, you are building a cross scenario without passing -cross."
+    #    exit 1
     fi
 
     initDistroRidGlobal ${__BuildOS} ${__BuildArch} ${__PortableBuild} ${passedRootfsDir}
@@ -448,10 +448,10 @@ build_CoreLib()
     if [ $__SkipCrossgen == 1 ]; then
         echo "Skipping generating native image"
 
-        if [ $__CrossBuild == 1 ]; then
+        #if [ $__CrossBuild == 1 ]; then
             # Crossgen not performed, so treat the IL version as the final version
             cp $__CoreLibILDir/System.Private.CoreLib.dll $__BinDir/System.Private.CoreLib.dll
-        fi
+        #fi
 
         return
     fi
@@ -782,6 +782,21 @@ while :; do
             __ClangMinorVersion=
             ;;
 
+        clang8|-clang8)
+            __ClangMajorVersion=8
+            __ClangMinorVersion=
+            ;;
+
+        clang9|-clang9)
+            __ClangMajorVersion=9
+            __ClangMinorVersion=
+            ;;
+
+        clang10|-clang10)
+            __ClangMajorVersion=10
+            __ClangMinorVersion=
+            ;;
+
         gcc5|-gcc5)
             __GccMajorVersion=5
             __GccMinorVersion=