From a0d40587ea0b7bdc4084bcd7727d876948d30d7d Mon Sep 17 00:00:00 2001 From: redfish Date: Sun, 28 Aug 2016 01:44:33 -0400 Subject: Revert "makefile: remove unnecessary ARM-specific targets" This reverts commit ecd0f2dde7b2d8f3ff820d1190c00401c436384a. These targets that are not native builds. They are for builds portable within processors of a given family. 'make release' used to not work to build a native build on ARM, but that has been fixed. These targets are unrelated to the native build. --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 69d1127de..b02f92ad5 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,14 @@ release-all: mkdir -p build/release cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) +release-arm6: + mkdir -p build/release + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + +release-arm7: + mkdir -p build/release + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + release-static: release-static-64 release-static-64: -- cgit v1.2.3 From 57ca3f3f64ebfcd83af899cbff58e683198152a0 Mon Sep 17 00:00:00 2001 From: redfish Date: Sun, 28 Aug 2016 05:35:27 -0400 Subject: make: make the ARM release targets statically linked I think, in this context, dynamically linked builds make sense only for native builds, not these builds that target arch families to produce portable binaries. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b02f92ad5..d1dea23a3 100644 --- a/Makefile +++ b/Makefile @@ -58,13 +58,13 @@ release-all: mkdir -p build/release cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) -release-arm6: +release-static-arm6: mkdir -p build/release - cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D STATIC=ON -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) -release-arm7: +release-static-arm7: mkdir -p build/release - cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) release-static: release-static-64 -- cgit v1.2.3 From 397b720069e4c6011e20c6f9d4848c6092f002f3 Mon Sep 17 00:00:00 2001 From: redfish Date: Sun, 28 Aug 2016 05:42:06 -0400 Subject: make: remove NO_AES from arm targets cmake sets that appropriately based on the target architecture --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d1dea23a3..1b52fe2d0 100644 --- a/Makefile +++ b/Makefile @@ -60,11 +60,11 @@ release-all: release-static-arm6: mkdir -p build/release - cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D STATIC=ON -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv6zk" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) release-static-arm7: mkdir -p build/release - cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D NO_AES=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cd build/release && cmake -D BUILD_TESTS=OFF -D ARCH="armv7-a" -D STATIC=ON -D BUILD_64=OFF -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) release-static: release-static-64 -- cgit v1.2.3