diff options
Diffstat (limited to 'etc/defaults')
-rw-r--r-- | etc/defaults/CC/TARGETS | 24 | ||||
-rw-r--r-- | etc/defaults/CC/TARGETS.absl | 12 | ||||
-rw-r--r-- | etc/defaults/CC/TARGETS.archive | 12 | ||||
-rw-r--r-- | etc/defaults/CC/TARGETS.curl | 12 | ||||
-rw-r--r-- | etc/defaults/CC/TARGETS.git2 | 12 | ||||
-rw-r--r-- | etc/defaults/CC/TARGETS.grpc | 22 | ||||
-rw-r--r-- | etc/defaults/CC/TARGETS.protobuf | 12 |
7 files changed, 90 insertions, 16 deletions
diff --git a/etc/defaults/CC/TARGETS b/etc/defaults/CC/TARGETS index 1b3d6a1f..f6e13ea6 100644 --- a/etc/defaults/CC/TARGETS +++ b/etc/defaults/CC/TARGETS @@ -1,10 +1,19 @@ { "defaults": { "type": ["CC", "defaults"] - , "arguments_config": ["COMPILER_FAMILY", "DEBUG"] + , "arguments_config": ["TOOLCHAIN_CONFIG", "DEBUG"] , "base": [["@", "toolchain", "CC", "defaults"]] , "ADD_CFLAGS": { "type": "case" - , "expr": {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , "expr": + { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } , "case": { "msvc": { "type": "if" @@ -22,7 +31,16 @@ } , "ADD_CXXFLAGS": { "type": "case" - , "expr": {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , "expr": + { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } , "case": { "msvc": { "type": "if" diff --git a/etc/defaults/CC/TARGETS.absl b/etc/defaults/CC/TARGETS.absl index 7985d990..266709c9 100644 --- a/etc/defaults/CC/TARGETS.absl +++ b/etc/defaults/CC/TARGETS.absl @@ -1,12 +1,20 @@ { "defaults": { "type": ["CC", "defaults"] - , "arguments_config": ["COMPILER_FAMILY", "OS", "ARCH", "TARGET_ARCH"] + , "arguments_config": ["TOOLCHAIN_CONFIG", "OS", "ARCH", "TARGET_ARCH"] , "base": [["@", "base", "CC", "defaults"]] , "ADD_CXXFLAGS": { "type": "let*" , "bindings": [ [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] , [ "OS" , { "type": "var" diff --git a/etc/defaults/CC/TARGETS.archive b/etc/defaults/CC/TARGETS.archive index f5a792a8..1aa19fb6 100644 --- a/etc/defaults/CC/TARGETS.archive +++ b/etc/defaults/CC/TARGETS.archive @@ -1,7 +1,7 @@ { "defaults": { "type": ["CC", "defaults"] , "arguments_config": - ["OS", "COMPILER_FAMILY", "DEBUG", "ENABLE_BZip2", "HIDE_SYMBOLS"] + ["OS", "TOOLCHAIN_CONFIG", "DEBUG", "ENABLE_BZip2", "HIDE_SYMBOLS"] , "base": [["@", "base", "CC", "defaults"]] , "ADD_CFLAGS": { "type": "let*" @@ -14,7 +14,15 @@ } ] , [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] , ["DEBUG", {"type": "var", "name": "DEBUG", "default": false}] ] diff --git a/etc/defaults/CC/TARGETS.curl b/etc/defaults/CC/TARGETS.curl index 233c3b6f..e57d38bc 100644 --- a/etc/defaults/CC/TARGETS.curl +++ b/etc/defaults/CC/TARGETS.curl @@ -1,13 +1,21 @@ { "defaults": { "type": ["CC", "defaults"] , "arguments_config": - ["COMPILER_FAMILY", "CURL_ENABLE_SSL", "ARCH", "TARGET_ARCH"] + ["TOOLCHAIN_CONFIG", "CURL_ENABLE_SSL", "ARCH", "TARGET_ARCH"] , "base": [["@", "base", "CC", "defaults"]] , "ADD_CFLAGS": { "type": "let*" , "bindings": [ [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] , [ "CURL_ENABLE_SSL" , {"type": "var", "name": "CURL_ENABLE_SSL", "default": true} diff --git a/etc/defaults/CC/TARGETS.git2 b/etc/defaults/CC/TARGETS.git2 index 595cee1f..12320267 100644 --- a/etc/defaults/CC/TARGETS.git2 +++ b/etc/defaults/CC/TARGETS.git2 @@ -1,12 +1,20 @@ { "defaults": { "type": ["CC", "defaults"] - , "arguments_config": ["COMPILER_FAMILY", "OS"] + , "arguments_config": ["TOOLCHAIN_CONFIG", "OS"] , "base": [["@", "base", "CC", "defaults"]] , "ADD_CFLAGS": { "type": "let*" , "bindings": [ [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] , [ "OS" , { "type": "var" diff --git a/etc/defaults/CC/TARGETS.grpc b/etc/defaults/CC/TARGETS.grpc index fbafa136..86cf6e19 100644 --- a/etc/defaults/CC/TARGETS.grpc +++ b/etc/defaults/CC/TARGETS.grpc @@ -1,13 +1,21 @@ { "defaults": { "type": ["CC", "defaults"] , "arguments_config": - ["DEBUG", "OS", "ARCH", "TARGET_ARCH", "COMPILER_FAMILY"] + ["DEBUG", "OS", "ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG"] , "base": [["@", "base", "CC", "defaults"]] , "ADD_CFLAGS": { "type": "let*" , "bindings": [ [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] , [ "OS" , { "type": "var" @@ -73,7 +81,15 @@ { "type": "let*" , "bindings": [ [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] , [ "OS" , { "type": "var" diff --git a/etc/defaults/CC/TARGETS.protobuf b/etc/defaults/CC/TARGETS.protobuf index f2ae56d6..229c8f31 100644 --- a/etc/defaults/CC/TARGETS.protobuf +++ b/etc/defaults/CC/TARGETS.protobuf @@ -1,13 +1,21 @@ { "defaults": { "type": ["CC", "defaults"] - , "arguments_config": ["ARCH", "TARGET_ARCH", "COMPILER_FAMILY"] + , "arguments_config": ["ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG"] , "base": [["@", "base", "CC", "defaults"]] , "ADD_CFLAGS": ["-std=gnu17"] , "ADD_CXXFLAGS": { "type": "let*" , "bindings": [ [ "COMPILER_FAMILY" - , {"type": "var", "name": "COMPILER_FAMILY", "default": "unknown"} + , { "type": "lookup" + , "map": + { "type": "var" + , "name": "TOOLCHAIN_CONFIG" + , "default": {"type": "empty_map"} + } + , "key": "FAMILY" + , "default": "unknown" + } ] ] , "body": |