Allow setting built-in options from cross/native files

This is like the project options, but for meson builtin options.

The only real differences here have to do with the differences between
meson builtin options and project options. Some meson options can be set
on a per-machine basis (build.pkg_config_path vs pkg_config_path) others
can be set on a per-subproject basis, but should inherit the parent
setting.

10 files changed, 23 insertions, 18 deletions

diff --git a/cross/armcc.txt b/cross/armcc.txt
index c884ffa97..ae65c9e5e 100644
--- a/cross/armcc.txt
+++ b/cross/armcc.txt
@@ -7,7 +7,7 @@ cpp = 'armcc'
 ar = 'armar'
 strip = 'armar'
 
-[properties]
+[built-in options]
 # The '--cpu' option with the appropriate target type should be mentioned
 # to cross compile c/c++ code with armcc,.
 c_args      = ['--cpu=Cortex-M0plus']
diff --git a/cross/armclang-linux.txt b/cross/armclang-linux.txt
index 6df78d61a..10f6fa44b 100644
--- a/cross/armclang-linux.txt
+++ b/cross/armclang-linux.txt
@@ -12,7 +12,7 @@
 # Armcc is only available in toolchain version 5.
 # Armclang is only available in toolchain version 6.
 # Start shell with /opt/arm/developmentstudio-2019.0/bin/suite_exec zsh
-# Now the compilers will work. 
+# Now the compilers will work.
 
 [binaries]
 # we could set exe_wrapper = qemu-arm-static but to test the case
@@ -24,8 +24,7 @@ ar = '/opt/arm/developmentstudio-2019.0/sw/ARMCompiler6.12/bin/armar'
 #strip = '/usr/arm-linux-gnueabihf/bin/strip'
 #pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 
-[properties]
-
+[built-in options]
 c_args = ['--target=aarch64-arm-none-eabi']
 
 [host_machine]
diff --git a/cross/armclang.txt b/cross/armclang.txt
index 955b7ef57..6146e0d74 100644
--- a/cross/armclang.txt
+++ b/cross/armclang.txt
@@ -7,7 +7,7 @@ cpp = 'armclang'
 ar = 'armar'
 strip = 'armar'
 
-[properties]
+[built-in options]
 # The '--target', '-mcpu' options with the appropriate values should be mentioned
 # to cross compile c/c++ code with armclang.
 c_args      = ['--target=arm-arm-none-eabi', '-mcpu=cortex-m0plus']
diff --git a/cross/c2000.txt b/cross/c2000.txt
index e624f253a..61c03109d 100644
--- a/cross/c2000.txt
+++ b/cross/c2000.txt
@@ -12,8 +12,7 @@ cpu_family = 'c2000'
 cpu = 'c28x'
 endian = 'little'
 
-[properties]
-needs_exe_wrapper = true
+[built-in options]
 c_args = [
     '-v28',
     '-ml',
@@ -24,3 +23,6 @@ c_link_args = [
     '\f28004x_flash.cmd']
 cpp_args = []
 cpp_link_args = []
+
+[properties]
+needs_exe_wrapper = true
diff --git a/cross/ccrx.txt b/cross/ccrx.txt
index 097ec068e..f1b536c3a 100644
--- a/cross/ccrx.txt
+++ b/cross/ccrx.txt
@@ -7,7 +7,7 @@ cpp = 'ccrx'
 ar = 'rlink'
 strip = 'rlink'
 
-[properties]
+[built-in options]
 # The '--cpu' option with the appropriate target type should be mentioned
 # to cross compile c/c++ code with ccrx,.
 c_args      = ['-cpu=rx600']
diff --git a/cross/iphone.txt b/cross/iphone.txt
index e714da54e..965940722 100644
--- a/cross/iphone.txt
+++ b/cross/iphone.txt
@@ -8,14 +8,14 @@ cpp = 'clang++'
 ar = 'ar'
 strip = 'strip'
 
-[properties]
-root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'
-
+[built-in options]
 c_args = ['-arch', 'armv7', '-miphoneos-version-min=8.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk']
 cpp_args = ['-arch', 'armv7', '-miphoneos-version-min=8.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk']
 c_link_args = ['-arch', 'armv7', '-miphoneos-version-min=8.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk']
 cpp_link_args = ['-arch', 'armv7', '-miphoneos-version-min=8.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk']
 
+[properties]
+root = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'
 has_function_printf = true
 has_function_hfkerhisadf = false
 
diff --git a/cross/tvos.txt b/cross/tvos.txt
index dd6d5c16b..833f04bfd 100644
--- a/cross/tvos.txt
+++ b/cross/tvos.txt
@@ -8,14 +8,15 @@ cpp = 'clang++'
 ar = 'ar'
 strip = 'strip'
 
-[properties]
-root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer'
-
+[built-in options]
 c_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
 cpp_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
 c_link_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
 cpp_link_args = ['-arch', 'arm64', '-mtvos-version-min=12.0', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk']
 
+[properties]
+root = '/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer'
+
 has_function_printf = true
 has_function_hfkerhisadf = false
 
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
index 4600c2281..69e0c8611 100644
--- a/cross/ubuntu-armhf.txt
+++ b/cross/ubuntu-armhf.txt
@@ -9,12 +9,14 @@ strip = '/usr/arm-linux-gnueabihf/bin/strip'
 pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'
 ld = '/usr/bin/arm-linux/gnueabihf-ld'
 
-[properties]
-root = '/usr/arm-linux-gnueabihf'
+[built-in options]
 # Used in unit test '140 get define'
 c_args = ['-DMESON_TEST_ISSUE_1665=1']
 cpp_args = '-DMESON_TEST_ISSUE_1665=1'
 
+[properties]
+root = '/usr/arm-linux-gnueabihf'
+
 has_function_printf = true
 has_function_hfkerhisadf = false
 
diff --git a/cross/wasm.txt b/cross/wasm.txt
index a43636fde..f2d0cd7f5 100644
--- a/cross/wasm.txt
+++ b/cross/wasm.txt
@@ -3,8 +3,7 @@ c = '/home/jpakkane/emsdk/fastcomp/emscripten/emcc'
 cpp = '/home/jpakkane/emsdk/fastcomp/emscripten/em++'
 ar = '/home/jpakkane/emsdk/fastcomp/emscripten/emar'
 
-[properties]
-
+[built-in options]
 c_args = ['-s', 'WASM=1', '-s', 'EXPORT_ALL=1']
 c_link_args = ['-s','EXPORT_ALL=1']
 cpp_args = ['-s', 'WASM=1', '-s', 'EXPORT_ALL=1']
diff --git a/cross/xc16.txt b/cross/xc16.txt
index 1e673622f..c66889deb 100644
--- a/cross/xc16.txt
+++ b/cross/xc16.txt
@@ -14,6 +14,8 @@ endian = 'little'
 
 [properties]
 needs_exe_wrapper = true
+
+[built-in options]
 c_args = [
     '-c',
     '-mcpu=33EP64MC203',