diff options
author | hlopko <hlopko@google.com> | 2017-04-27 17:37:31 +0200 |
---|---|---|
committer | Vladimir Moskva <vladmos@google.com> | 2017-04-28 01:00:52 +0200 |
commit | 21903f9ee78c42b55fd7954701aafcc65dcfcb11 (patch) | |
tree | 3c3de7d7b88ca35535d8473f403f7f4a5d37c6d8 /tools | |
parent | d89d3974bce2b8bf44a40bfe7b6b56cc9d703c93 (diff) |
Reformat Bazel crosstools to have consistent 2 spaces indent
RELNOTES: None.
PiperOrigin-RevId: 154426101
Diffstat (limited to 'tools')
-rw-r--r-- | tools/cpp/CROSSTOOL | 68 | ||||
-rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 180 |
2 files changed, 124 insertions, 124 deletions
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL index 8bcf94cfe7..bb22006090 100644 --- a/tools/cpp/CROSSTOOL +++ b/tools/cpp/CROSSTOOL @@ -523,40 +523,40 @@ toolchain { } toolchain { - abi_version: "local" - abi_libc_version: "local" - builtin_sysroot: "" - compiler: "windows_msys64" - host_system_name: "local" - needsPic: false - target_libc: "local" - target_cpu: "x64_windows" - target_system_name: "local" - toolchain_identifier: "local_windows_msys64" - - tool_path { name: "ar" path: "C:/tools/msys64/usr/bin/ar" } - tool_path { name: "compat-ld" path: "C:/tools/msys64/usr/bin/ld" } - tool_path { name: "cpp" path: "C:/tools/msys64/usr/bin/cpp" } - tool_path { name: "dwp" path: "C:/tools/msys64/usr/bin/dwp" } - # Use gcc instead of g++ so that C will compile correctly. - tool_path { name: "gcc" path: "C:/tools/msys64/usr/bin/gcc" } - cxx_flag: "-std=gnu++0x" - linker_flag: "-lstdc++" - # TODO(bazel-team): In theory, the path here ought to exactly match the path - # used by gcc. That works because bazel currently doesn't track files at - # absolute locations and has no remote execution, yet. However, this will need - # to be fixed, maybe with auto-detection? - cxx_builtin_include_directory: "C:/tools/msys64/" - cxx_builtin_include_directory: "/usr/" - tool_path { name: "gcov" path: "C:/tools/msys64/usr/bin/gcov" } - tool_path { name: "ld" path: "C:/tools/msys64/usr/bin/ld" } - tool_path { name: "nm" path: "C:/tools/msys64/usr/bin/nm" } - tool_path { name: "objcopy" path: "C:/tools/msys64/usr/bin/objcopy" } - objcopy_embed_flag: "-I" - objcopy_embed_flag: "binary" - tool_path { name: "objdump" path: "C:/tools/msys64/usr/bin/objdump" } - tool_path { name: "strip" path: "C:/tools/msys64/usr/bin/strip" } - linking_mode_flags { mode: DYNAMIC } + abi_version: "local" + abi_libc_version: "local" + builtin_sysroot: "" + compiler: "windows_msys64" + host_system_name: "local" + needsPic: false + target_libc: "local" + target_cpu: "x64_windows" + target_system_name: "local" + toolchain_identifier: "local_windows_msys64" + + tool_path { name: "ar" path: "C:/tools/msys64/usr/bin/ar" } + tool_path { name: "compat-ld" path: "C:/tools/msys64/usr/bin/ld" } + tool_path { name: "cpp" path: "C:/tools/msys64/usr/bin/cpp" } + tool_path { name: "dwp" path: "C:/tools/msys64/usr/bin/dwp" } + # Use gcc instead of g++ so that C will compile correctly. + tool_path { name: "gcc" path: "C:/tools/msys64/usr/bin/gcc" } + cxx_flag: "-std=gnu++0x" + linker_flag: "-lstdc++" + # TODO(bazel-team): In theory, the path here ought to exactly match the path + # used by gcc. That works because bazel currently doesn't track files at + # absolute locations and has no remote execution, yet. However, this will need + # to be fixed, maybe with auto-detection? + cxx_builtin_include_directory: "C:/tools/msys64/" + cxx_builtin_include_directory: "/usr/" + tool_path { name: "gcov" path: "C:/tools/msys64/usr/bin/gcov" } + tool_path { name: "ld" path: "C:/tools/msys64/usr/bin/ld" } + tool_path { name: "nm" path: "C:/tools/msys64/usr/bin/nm" } + tool_path { name: "objcopy" path: "C:/tools/msys64/usr/bin/objcopy" } + objcopy_embed_flag: "-I" + objcopy_embed_flag: "binary" + tool_path { name: "objdump" path: "C:/tools/msys64/usr/bin/objdump" } + tool_path { name: "strip" path: "C:/tools/msys64/usr/bin/strip" } + linking_mode_flags { mode: DYNAMIC } } toolchain { diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index 353e86fa82..f4f0f36834 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -406,87 +406,87 @@ toolchain { } action_config { - config_name: 'c++-link-executable' - action_name: 'c++-link-executable' - tool { - tool_path: 'wrapper/bin/msvc_link.bat' - } - implies: 'nologo' - implies: 'strip_debug_symbols' - implies: 'linkstamps' - implies: 'output_execpath_flags' - implies: 'input_param_flags' - implies: 'legacy_link_flags' - implies: 'linker_param_file' - implies: 'msvc_env' + config_name: 'c++-link-executable' + action_name: 'c++-link-executable' + tool { + tool_path: 'wrapper/bin/msvc_link.bat' + } + implies: 'nologo' + implies: 'strip_debug_symbols' + implies: 'linkstamps' + implies: 'output_execpath_flags' + implies: 'input_param_flags' + implies: 'legacy_link_flags' + implies: 'linker_param_file' + implies: 'msvc_env' } action_config { - config_name: 'c++-link-dynamic-library' - action_name: 'c++-link-dynamic-library' - tool { - tool_path: 'wrapper/bin/msvc_link.bat' - } - implies: 'nologo' - implies: 'strip_debug_symbols' - implies: 'shared_flag' - implies: 'linkstamps' - implies: 'output_execpath_flags' - implies: 'input_param_flags' - implies: 'has_configured_linker_path' - implies: 'legacy_link_flags' - implies: 'linker_param_file' - implies: 'msvc_env' + config_name: 'c++-link-dynamic-library' + action_name: 'c++-link-dynamic-library' + tool { + tool_path: 'wrapper/bin/msvc_link.bat' + } + implies: 'nologo' + implies: 'strip_debug_symbols' + implies: 'shared_flag' + implies: 'linkstamps' + implies: 'output_execpath_flags' + implies: 'input_param_flags' + implies: 'has_configured_linker_path' + implies: 'legacy_link_flags' + implies: 'linker_param_file' + implies: 'msvc_env' } action_config { - config_name: 'c++-link-static-library' - action_name: 'c++-link-static-library' - tool { - tool_path: 'wrapper/bin/msvc_link.bat' - } - implies: 'nologo' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' + config_name: 'c++-link-static-library' + action_name: 'c++-link-static-library' + tool { + tool_path: 'wrapper/bin/msvc_link.bat' + } + implies: 'nologo' + implies: 'input_param_flags' + implies: 'linker_param_file' + implies: 'msvc_env' } action_config { - config_name: 'c++-link-alwayslink-static-library' - action_name: 'c++-link-alwayslink-static-library' - tool { - tool_path: 'wrapper/bin/msvc_link.bat' - } - implies: 'nologo' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' + config_name: 'c++-link-alwayslink-static-library' + action_name: 'c++-link-alwayslink-static-library' + tool { + tool_path: 'wrapper/bin/msvc_link.bat' + } + implies: 'nologo' + implies: 'input_param_flags' + implies: 'linker_param_file' + implies: 'msvc_env' } # TODO(pcloudy): The following action_config is listed in MANDATORY_LINK_TARGET_TYPES. # But do we really need them on Windows? action_config { - config_name: 'c++-link-pic-static-library' - action_name: 'c++-link-pic-static-library' - tool { - tool_path: 'wrapper/bin/msvc_link.bat' - } - implies: 'nologo' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' + config_name: 'c++-link-pic-static-library' + action_name: 'c++-link-pic-static-library' + tool { + tool_path: 'wrapper/bin/msvc_link.bat' + } + implies: 'nologo' + implies: 'input_param_flags' + implies: 'linker_param_file' + implies: 'msvc_env' } action_config { - config_name: 'c++-link-alwayslink-pic-static-library' - action_name: 'c++-link-alwayslink-pic-static-library' - tool { - tool_path: 'wrapper/bin/msvc_link.bat' - } - implies: 'nologo' - implies: 'input_param_flags' - implies: 'linker_param_file' - implies: 'msvc_env' + config_name: 'c++-link-alwayslink-pic-static-library' + action_name: 'c++-link-alwayslink-pic-static-library' + tool { + tool_path: 'wrapper/bin/msvc_link.bat' + } + implies: 'nologo' + implies: 'input_param_flags' + implies: 'linker_param_file' + implies: 'msvc_env' } action_config { @@ -529,37 +529,37 @@ toolchain { } feature { - name: 'shared_flag' - flag_set { - action: 'c++-link-dynamic-library' - flag_group { - flag: '/DLL' - } - } + name: 'shared_flag' + flag_set { + action: 'c++-link-dynamic-library' + flag_group { + flag: '/DLL' + } + } } feature { - name: 'linkstamps' - flag_set { - action: 'c++-link-executable' - action: 'c++-link-dynamic-library' - expand_if_all_available: 'linkstamp_paths' - flag_group { - flag: '%{linkstamp_paths}' - } - } + name: 'linkstamps' + flag_set { + action: 'c++-link-executable' + action: 'c++-link-dynamic-library' + expand_if_all_available: 'linkstamp_paths' + flag_group { + flag: '%{linkstamp_paths}' + } + } } feature { - name: 'output_execpath_flags' - flag_set { - expand_if_all_available: 'output_execpath' - action: 'c++-link-executable' - action: 'c++-link-dynamic-library' - flag_group { - flag: '/OUT:%{output_execpath}' - } - } + name: 'output_execpath_flags' + flag_set { + expand_if_all_available: 'output_execpath' + action: 'c++-link-executable' + action: 'c++-link-dynamic-library' + flag_group { + flag: '/OUT:%{output_execpath}' + } + } } feature { @@ -586,7 +586,7 @@ toolchain { action: 'c++-link-pic-static-library' action: 'c++-link-alwayslink-pic-static-library' flag_group { - flag: '%{libopts}' + flag: '%{libopts}' } } flag_set { |