gnu: Add legacy Zephyr bisectability

In setup.sh, add option to create symlinks from gnu/ so that
paths match previous SDK versions.

In Zephyr-sdkConfig.cmake, set ZEPHYR_TOOLCHAIN_VARIANT to zephyr/gnu
only when Zephyr sets ZEPHYR_TOOLCHAIN_VARIANT_COMPILER_SUPPORT before
finding the SDK module. This will require a change to Zephyr, which is
unfortunate. Ideally, we'd use some existing mechanism to detect when
to make this switch, but it needs to be synchronous with with changes
in Zephyr which enable this support, and I couldn't find anything in
that series which looked workable.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

cmake/Zephyr-sdkConfig.cmake

@@ -13,7 +13,11 @@ get_filename_component(ZEPHYR_SDK_INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/.. ABSOL
 set(ZEPHYR_SDK_INSTALL_DIR ${ZEPHYR_SDK_INSTALL_DIR})
 
 if(NOT DEFINED ZEPHYR_TOOLCHAIN_VARIANT)
-  set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr/gnu")
+  if(DEFINED ZEPHYR_TOOLCHAIN_VARIANT_COMPILER_SUPPORT)
+    set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr/gnu")
+  else()
+    set(ZEPHYR_TOOLCHAIN_VARIANT "zephyr")
+  endif()
 endif()
 
 # Those are CMake package parameters.

scripts/template_setup_posix

@@ -69,6 +69,7 @@ usage()
   echo "     all               Install all GNU toolchains"
   echo "  -l                   Install LLVM toolchain"
   echo "  -h                   Install host tools"
+  echo "  -o                   Create symbolic links matching the old SDK layout for old Zephyr (< 4.3) bisectability"
   echo "  -c                   Register Zephyr SDK CMake package"
   echo
   echo "Supported GNU Toolchains:"
@@ -117,6 +118,8 @@ user_prompt()
   # Environment Configurations
   ask_yn "Register Zephyr SDK CMake package" && do_cmake_pkg="y"
 
+  ask_yn "Create symbolic links for old Zephyr bisectability" && do_old_zephyr="y"
+
   echo
 }
 
@@ -159,6 +162,9 @@ else
       -c)
         do_cmake_pkg="y"
         ;;
+      -o)
+	do_old_zephyr="y"
+	;;
       '-?')
         usage
         exit 0
@@ -301,6 +307,15 @@ if [ "${do_cmake_pkg}" = "y" ]; then
   echo
 fi
 
+# Create links for old Zephyr versions
+if [ "${do_old_zephyr}" = "y" ]; then
+  echo "Creating links for old Zephyr bisectability ..."
+  ln -sr gnu/* . || assert_rc "ERROR: Creating toolchain links" 50
+  ln -sr cmake/zephyr/gnu/* cmake/zephyr || assert_rc "ERROR: Creating cmake links" 50
+  ln -sr hosttools/* . || assert_rc "ERROR: Creating hosttools links" 50
+  echo
+fi
+
 echo "All done."
 if [ "${interactive}" = "y" ]; then
   read -n 1 -s -r -p "Press any key to exit ..."