fixup! Add IncludePath to multilib.yaml conditionally.

Only enable IncludePaths in multilib.yaml if header
optimization is turned on.

Author: simpal01

arm-software/embedded/arm-multilib/CMakeLists.txt

@@ -342,10 +342,12 @@ foreach(lib_idx RANGE ${lib_count_dec})
             foreach(flag ${multilib_flags_list})
                 string(APPEND multilib_yaml_content "  - ${flag}\n")
             endforeach()
-            string(APPEND multilib_yaml_content "  IncludePath:\n")
-            string(APPEND multilib_yaml_content "  - ${parent_dir_name}/include\n")
-            string(APPEND multilib_yaml_content "  - ${parent_dir_name}/${variant}/include\n")
-            string(APPEND multilib_yaml_content "  Group: stdlibs\n")
+            if(ENABLE_MULTILIB_HEADER_OPTIMISATION)
+                string(APPEND multilib_yaml_content "  IncludePath:\n")
+                string(APPEND multilib_yaml_content "  - ${parent_dir_name}/include\n")
+                string(APPEND multilib_yaml_content "  - ${parent_dir_name}/${variant}/include\n")
+                string(APPEND multilib_yaml_content "  Group: stdlibs\n")
+            endif()
         else()
             # In place of a json, an error message is expected.
             string(JSON variant_error_msg GET ${lib_def} "error")