Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add riscv64 info and simplify macos #394

Merged
merged 10 commits into from
Sep 7, 2023
Merged

Add riscv64 info and simplify macos #394

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1852499
Add riscv64 info and simplify macos
emlowe Sep 1, 2023
c9baebd
Add riscv qemu test
emlowe Sep 5, 2023
43e7458
actually run tests
emlowe Sep 5, 2023
db99897
Update build-test-riscv64.yml
emlowe Sep 5, 2023
797a95f
Don't run tests in qemu
emlowe Sep 7, 2023
2155b7b
Build and test wheel
emlowe Sep 7, 2023
e09149b
install python-full
emlowe Sep 7, 2023
dc025fc
Try with swapfile
emlowe Sep 7, 2023
e3bf754
Don't run k_21 test and add upload step
emlowe Sep 7, 2023
3ed4e6a
Update .github/workflows/build-test-riscv64.yml
emlowe Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,6 @@ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -fno-omit-frame-pointer -fsanitize=thre
set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fno-omit-frame-pointer -fsanitize=thread")
ENDIF()

IF (APPLE)
# on macOS "uname -m" returns the architecture (x86_64 or arm64)
execute_process(
COMMAND uname -m
RESULT_VARIABLE result
OUTPUT_VARIABLE OSX_NATIVE_ARCHITECTURE
OUTPUT_STRIP_TRAILING_WHITESPACE)
ENDIF()

IF (WIN32)
set(BLAKE3_SRC
src/b3/blake3.c
Expand All @@ -141,7 +132,7 @@ set(BLAKE3_SRC
src/b3/blake3_avx512.c
src/b3/blake3_sse41.c
)
ELSEIF(OSX_NATIVE_ARCHITECTURE STREQUAL "arm64")
ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64|arm64")
set(BLAKE3_SRC
src/b3/blake3.c
src/b3/blake3_portable.c
Expand Down