Merge pull request linuxboot#657 from MrChromebox/fix-librem-hotp

libremkey-hotp-verification: toolchain adjustments
Nitrokey · Jan 28, 2020 · 4977650 · 4977650
2 parents ceda2d3 + ad2395d
commit 4977650
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/modules/libremkey-hotp-verification b/modules/libremkey-hotp-verification
@@ -16,4 +16,5 @@ libremkey-hotp-verification_output := \
 
 libremkey-hotp-verification_configure := \
  INSTALL="$(INSTALL)" \
+ CROSS="$(CROSS)" \
  cmake -DCMAKE_TOOLCHAIN_FILE=./Toolchain-heads.cmake -DCMAKE_AR="$(CROSS)ar" . 
diff --git a/patches/libremkey-hotp-verification.patch b/patches/libremkey-hotp-verification.patch
@@ -1,15 +1,24 @@
 --- nitrokey-hotp-verification-a/Toolchain-heads.cmake 2018-05-22 09:55:46.907209235 -0700
 +++ nitrokey-hotp-verification-b/Toolchain-heads.cmake 2018-05-22 09:55:26.659371966 -0700
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,27 @@
 +SET(CMAKE_SYSTEM_NAME Linux)
 +SET(CMAKE_SYSTEM_VERSION 1)
 +
 +# Specify the cross compiler
-+SET(CMAKE_C_COMPILER $ENV{INSTALL}/bin/musl-gcc)
-+SET(CMAKE_CXX_COMPILER $ENV{INSTALL}/bin/musl-gcc)
++SET(CMAKE_C_COMPILER $ENV{CROSS}gcc)
++SET(CMAKE_CXX_COMPILER $ENV{CROSS}gcc)
++
++#sysroot location
++set(MYSYSROOT $ENV{INSTALL})
++
++# compiler/linker flags
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE)
++set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE)
++set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} --sysroot=${MYSYSROOT}" CACHE INTERNAL "" FORCE)
 +
 +# Where is the target environment
-+SET(CMAKE_FIND_ROOT_PATH $ENV{INSTALL})
++SET(CMAKE_FIND_ROOT_PATH "${MYSYSROOT}")
 +
 +# Search for programs only in the build host directories
 +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)