diff options
| author | Benoit Jacob <benoitjacob@google.com> | 2021-06-18 07:00:46 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-06-18 07:01:09 -0700 |
| commit | e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce (patch) | |
| tree | 707e0f1c53751920c3024830d624ec7250825a45 | |
| parent | 22f89228893b3abae601004a6e48b64e089fc626 (diff) | |
| download | ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.tar.gz | |
Fix the bazel build by dropping a xtensa-specific select entry.
PiperOrigin-RevId: 380178286
| -rwxr-xr-x | cmake/bazel_to_cmake.py | 2 | ||||
| -rw-r--r-- | ruy/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ruy/build_defs.oss.bzl | 1 | ||||
| -rw-r--r-- | ruy/profiler/CMakeLists.txt | 2 |
4 files changed, 0 insertions, 7 deletions
diff --git a/cmake/bazel_to_cmake.py b/cmake/bazel_to_cmake.py index fc01c2a..8f972ba 100755 --- a/cmake/bazel_to_cmake.py +++ b/cmake/bazel_to_cmake.py @@ -97,8 +97,6 @@ def generate_cmake_select(select_name, dict): condition = 'MSVC' elif re.search(r':ruy_profiler$', key): condition = '${RUY_PROFILER}' - elif re.search(r'//tools/cc_target_os:xtensa$', key): - condition = 'CMAKE_SYSTEM_NAME STREQUAL xtensa-esp32-elf' else: raise ValueError(f'Unhandled key in select: {key}') diff --git a/ruy/CMakeLists.txt b/ruy/CMakeLists.txt index 0337768..502ad8a 100644 --- a/ruy/CMakeLists.txt +++ b/ruy/CMakeLists.txt @@ -107,8 +107,6 @@ ruy_cc_library( if(CMAKE_SYSTEM_NAME STREQUAL Windows) set(ruy_3_pthread "") -elseif(CMAKE_SYSTEM_NAME STREQUAL xtensa-esp32-elf) - set(ruy_3_pthread "") else() set(ruy_3_pthread "-pthread") endif() diff --git a/ruy/build_defs.oss.bzl b/ruy/build_defs.oss.bzl index 485d453..e405b41 100644 --- a/ruy/build_defs.oss.bzl +++ b/ruy/build_defs.oss.bzl @@ -11,6 +11,5 @@ def ruy_linkopts_thread_standard_library(): # https://github.com/abseil/abseil-cpp/blob/1112609635037a32435de7aa70a9188dcb591458/absl/base/BUILD.bazel#L155 return select({ "@bazel_tools//src/conditions:windows": [], - "//tools/cc_target_os:xtensa": [], "//conditions:default": ["-pthread"], }) diff --git a/ruy/profiler/CMakeLists.txt b/ruy/profiler/CMakeLists.txt index 35644fa..df4b30a 100644 --- a/ruy/profiler/CMakeLists.txt +++ b/ruy/profiler/CMakeLists.txt @@ -10,8 +10,6 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL Windows) set(ruy_profiler_1_pthread "") -elseif(CMAKE_SYSTEM_NAME STREQUAL xtensa-esp32-elf) - set(ruy_profiler_1_pthread "") else() set(ruy_profiler_1_pthread "-pthread") endif() |