Support BSD make and generic liboqs builds

This commit is contained in:
waozi committed 2026-07-09 18:51:30 -03:00
1 parent f0c400fcae
commit 6d859bd7a0
5 files changed
+10 -6

No files matched your search

+1
View File
@@ -0,0 +1 @@
include Makefile
+1
View File
@@ -0,0 +1 @@
include Makefile
+5 -5
View File
@@ -145,19 +145,19 @@ LDFLAGS = -Wl,--gc-sections -s
.NOTPARALLEL:
ifeq ($(strip $(RAY_CFLAGS)),)
$(error RAY_CFLAGS is not set. Enter the ray flake shell with 'nix develop')
$(error RAY_CFLAGS is not set. Install pkg-config metadata for $(RAY_PKGS), or set RAY_CFLAGS explicitly)
endif
ifeq ($(strip $(RAY_LDLIBS)),)
$(error RAY_LDLIBS is not set. Enter the ray flake shell with 'nix develop')
$(error RAY_LDLIBS is not set. Install pkg-config metadata for $(RAY_PKGS), or set RAY_LDLIBS explicitly)
endif
ifeq ($(strip $(RAY_SDL_LDLIBS)),)
$(error RAY_SDL_LDLIBS is not set. Enter the ray flake shell with 'nix develop')
$(error RAY_SDL_LDLIBS is not set. Install SDL2 development files or set RAY_SDL_LDLIBS explicitly)
endif
ifeq ($(strip $(RAY_SDL_INCLUDE_DIR)),)
$(error RAY_SDL_INCLUDE_DIR is not set. Enter the ray flake shell with 'nix develop')
$(error RAY_SDL_INCLUDE_DIR is not set. Install SDL2 development files or set RAY_SDL_INCLUDE_DIR explicitly)
endif
ifeq ($(strip $(RAY_RAYLIB_CONFIG)),)
$(error RAY_RAYLIB_CONFIG is not set. Enter the ray flake shell with 'nix develop')
$(error RAY_RAYLIB_CONFIG is not set. Set RAY_RAYLIB_CONFIG explicitly)
endif
build:
+1 -1
View File
@@ -70,7 +70,7 @@ linux-x86_64: | $(LINUX_BIN_DIR) $(LINUX_OBJ_DIR)
linux-aarch64: | $(LINUX_BIN_DIR) $(LINUX_OBJ_DIR)
@if [ -z "$(AARCH64_CC)" ] || [ -z "$(AARCH64_AR)" ] || [ -z "$(AARCH64_RAY_CFLAGS)" ] || [ -z "$(AARCH64_RAY_LDLIBS)" ] || [ -z "$(AARCH64_RAY_SDL_LDLIBS)" ] || [ -z "$(AARCH64_RAY_SDL_INCLUDE_DIR)" ]; then \
echo "AARCH64 cross-build variables are missing. Enter the flake shell with 'nix develop'."; \
echo "AARCH64 cross-build variables are missing. Install a cross toolchain and sysroot, or set AARCH64_CC/AARCH64_AR/AARCH64_RAY_* explicitly."; \
exit 1; \
fi
$(MAKE) build-linux-arch \
+2
View File
@@ -54,6 +54,8 @@ $(FLINT_LIBOQS_A): $(FLINT_LIBOQS_DIR)/CMakeLists.txt | $(FLINT_VENDOR_ORDER_ONL
-DBUILD_SHARED_LIBS=OFF \
-DOQS_BUILD_ONLY_LIB=ON \
-DOQS_USE_OPENSSL=OFF \
-DOQS_DIST_BUILD=OFF \
-DOQS_OPT_TARGET=generic \
-DOQS_MINIMAL_BUILD=$(FLINT_LIBOQS_MINIMAL_BUILD)
$(CMAKE) --build $(FLINT_LIBOQS_BUILD_DIR) --target oqs