Buildified the world again.
bzl files were pretty off.
Change-Id: Ief87d7c0a08c6706c8c6c573afef95a6d51968e7
diff --git a/tools/build_rules/select.bzl b/tools/build_rules/select.bzl
index 45ba612..3483360 100644
--- a/tools/build_rules/select.bzl
+++ b/tools/build_rules/select.bzl
@@ -28,32 +28,32 @@
"""
def cpu_select(values):
- if 'arm' in values:
- new_values = {}
- for cpu in values:
- if cpu != 'arm':
- new_values[cpu] = values[cpu]
- new_values['armhf'] = values['arm']
- new_values['roborio'] = values['arm']
- new_values['cortex-m'] = values['arm']
- values = new_values
- for cpu in all_cpus:
- if cpu not in values:
- if 'else' in values:
- values[cpu] = values['else']
- else:
- fail('Need to handle %s CPUs!' % cpu, 'values')
- for key in values:
- if key not in all_cpus and key != 'else':
- fail('Not sure what a %s CPU is!' % key, 'values')
- return select({
- '@//tools:cpu_k8': values['amd64'],
- '@//tools:cpu_roborio': values['roborio'],
- '@//tools:cpu_armhf': values['armhf'],
- '@//tools:cpu_cortex_m4f': values['cortex-m'],
- '@//tools:cpu_cortex_m4f_k22': values['cortex-m'],
- '@//tools:cpu_web': None,
- })
+ if "arm" in values:
+ new_values = {}
+ for cpu in values:
+ if cpu != "arm":
+ new_values[cpu] = values[cpu]
+ new_values["armhf"] = values["arm"]
+ new_values["roborio"] = values["arm"]
+ new_values["cortex-m"] = values["arm"]
+ values = new_values
+ for cpu in all_cpus:
+ if cpu not in values:
+ if "else" in values:
+ values[cpu] = values["else"]
+ else:
+ fail("Need to handle %s CPUs!" % cpu, "values")
+ for key in values:
+ if key not in all_cpus and key != "else":
+ fail("Not sure what a %s CPU is!" % key, "values")
+ return select({
+ "@//tools:cpu_k8": values["amd64"],
+ "@//tools:cpu_roborio": values["roborio"],
+ "@//tools:cpu_armhf": values["armhf"],
+ "@//tools:cpu_cortex_m4f": values["cortex-m"],
+ "@//tools:cpu_cortex_m4f_k22": values["cortex-m"],
+ "@//tools:cpu_web": None,
+ })
"""A select wrapper for address space sizes.
@@ -63,18 +63,18 @@
"""
def address_size_select(values):
- if '32' not in values:
- fail('Need to handle 32 bit addresses!', 'values')
- if '64' not in values:
- fail('Need to handle 64 bit addresses!', 'values')
- return select({
- '@//tools:cpu_k8': values['64'],
- '@//tools:cpu_roborio': values['32'],
- '@//tools:cpu_armhf': values['32'],
- '@//tools:cpu_cortex_m4f': values['32'],
- '@//tools:cpu_cortex_m4f_k22': values['32'],
- '@//tools:cpu_web': None,
- })
+ if "32" not in values:
+ fail("Need to handle 32 bit addresses!", "values")
+ if "64" not in values:
+ fail("Need to handle 64 bit addresses!", "values")
+ return select({
+ "@//tools:cpu_k8": values["64"],
+ "@//tools:cpu_roborio": values["32"],
+ "@//tools:cpu_armhf": values["32"],
+ "@//tools:cpu_cortex_m4f": values["32"],
+ "@//tools:cpu_cortex_m4f_k22": values["32"],
+ "@//tools:cpu_web": None,
+ })
"""A select wrapper for compilers.
@@ -85,12 +85,12 @@
"""
def compiler_select(values):
- if 'gcc' not in values:
- fail('Need to handle gcc!', 'values')
- if 'clang' not in values:
- fail('Need to handle clang!', 'values')
- return select({
- '@//tools:compiler_gcc': values['gcc'],
- '@//tools:compiler_clang': values['clang'],
- '@//tools:compiler_emscripten': None,
- })
+ if "gcc" not in values:
+ fail("Need to handle gcc!", "values")
+ if "clang" not in values:
+ fail("Need to handle clang!", "values")
+ return select({
+ "@//tools:compiler_gcc": values["gcc"],
+ "@//tools:compiler_clang": values["clang"],
+ "@//tools:compiler_emscripten": None,
+ })