Bugfix: Make sure the bootstrap.sh provide the standard default values.

This issue is exposed by the removal of numerous values from build settings files to favor the defaults.

diff --git a/build/scripts/bootstrap.sh b/build/scripts/bootstrap.sh
index 45a267ed5178d2c90480ba3cf087f64413c0169b..4ed0f71a655f47d2dfdff2f86a56a8ddaba83c2c 100644 (file)
--- a/build/scripts/bootstrap.sh
+++ b/build/scripts/bootstrap.sh
@@ -820,6 +820,46 @@ bootstrap_load_settings() {
     modes=${modes_default}
   fi
 
+  # Provide known defaults that have value of "yes".
+  for i in build_script build_shared build_static has_path_standard preserve_path_headers search_exclusive search_shared search_static ; do
+
+    bootstrap_id "${i}"
+
+    if [[ ${key} != "" ]] ; then
+      variables[${key}]="yes"
+    fi
+  done
+
+  # Provide known defaults that have value of "script".
+  for i in path_library_script path_object_script path_program_script ; do
+
+    bootstrap_id "${i}"
+
+    if [[ ${key} != "" ]] ; then
+      variables[${key}]="script"
+    fi
+  done
+
+  # Provide known defaults that have value of "shared".
+  for i in path_library_shared path_object_shared path_program_shared ; do
+
+    bootstrap_id "${i}"
+
+    if [[ ${key} != "" ]] ; then
+      variables[${key}]="shared"
+    fi
+  done
+
+  # Provide known defaults that have value of "static".
+  for i in path_library_static path_object_static path_program_static ; do
+
+    bootstrap_id "${i}"
+
+    if [[ ${key} != "" ]] ; then
+      variables[${key}]="static"
+    fi
+  done
+
   # Single value Objects.
   for i in build_compiler build_indexer build_language build_name build_script build_shared build_sources_object build_sources_object_shared build_sources_object_static build_static has_path_standard path_headers path_language path_library_script path_library_shared path_library_static path_object_script path_object_shared path_object_static path_program_script path_program_shared path_program_static path_sources path_sources_headers path_sources_library path_sources_object path_sources_program path_sources_script preserve_path_headers process_post process_pre search_exclusive search_shared search_static stage version_file version_major version_major_prefix version_micro version_micro_prefix version_minor version_minor_prefix version_nano version_nano_prefix version_target ; do