1 files changed, 9 insertions, 1 deletions
diff --git a/build-test.sh b/build-test.sh
index 94c9a4b6d4..bc77b6950c 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -364,7 +364,9 @@ build_Tests()
         __up="/t:UpdateInvalidPackageVersions"
     fi
 
-    generate_layout
+    if [[ "$__SkipGenerateLayout" != 1 ]]; then
+        generate_layout
+    fi
 }
 
 build_MSBuild_projects()
@@ -588,6 +590,7 @@ usage()
     echo "priority1 - include priority=1 tests in the build"
     echo "skipgenerateversion - disable version generation even if MSBuild is supported."
     echo "skipstressdependencies - disable build of libcoredistools.so for x64."
+    echo "skipgeneratelayout - Do not generate the Core_Root layout."
     exit 1
 }
 
@@ -695,6 +698,7 @@ __SkipManaged=0
 __SkipConfigure=0
 __SkipGenerateVersion=0
 __SkipStressDependencies=0
+__SkipGenerateLayout=0
 __ConfigureOnly=0
 __CrossBuild=0
 __ClangMajorVersion=0
@@ -952,6 +956,10 @@ while :; do
             __SkipStressDependencies=1
             ;;
 
+        skipgeneratelayout)
+            __SkipGenerateLayout=1
+            ;;
+
         *)
             __UnprocessedBuildArgs+=("$1")
             ;;