1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Index: ne10-1.2.1/GNUlinux_config.cmake
===================================================================
--- ne10-1.2.1.orig/GNUlinux_config.cmake
+++ ne10-1.2.1/GNUlinux_config.cmake
@@ -33,29 +33,19 @@
# Option:
# - Choose target architecture
# Target architecture can be specified by setting NE10_LINUX_TARGET_ARCH to
-# armv7 or aarch64 (Not done yet). Defaut is armv7.
+# armv7 or aarch64.
set(GNULINUX_PLATFORM ON)
if(NOT DEFINED ENV{NE10_LINUX_TARGET_ARCH})
- set(NE10_LINUX_TARGET_ARCH "armv7")
-else()
set(NE10_LINUX_TARGET_ARCH $ENV{NE10_LINUX_TARGET_ARCH})
endif()
-if(NE10_LINUX_TARGET_ARCH STREQUAL "armv7")
- set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
- set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
- set(CMAKE_ASM_COMPILER arm-linux-gnueabihf-as)
- find_program(CMAKE_AR NAMES "arm-linux-gnueabihf-ar")
- find_program(CMAKE_RANLIB NAMES "arm-linux-gnueabihf-ranlib")
-elseif(NE10_LINUX_TARGET_ARCH STREQUAL "aarch64")
- set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
- set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
- set(CMAKE_ASM_COMPILER aarch64-linux-gnu-as)
- find_program(CMAKE_AR NAMES "aarch64-linux-gnu-ar")
- find_program(CMAKE_RANLIB NAMES "aarch64-linux-gnu-ranlib")
-endif()
+set(CMAKE_C_COMPILER ENV{DEB_BUILD_GNU_TYPE}-gcc)
+set(CMAKE_CXX_COMPILER ENV{DEB_BUILD_GNU_TYPE}-g++)
+set(CMAKE_ASM_COMPILER ENV{DEB_BUILD_GNU_TYPE}-as)
+find_program(CMAKE_AR NAMES "ENV{DEB_BUILD_GNU_TYPE}-ar")
+find_program(CMAKE_RANLIB NAMES "ENV{DEB_BUILD_GNU_TYPE}-ranlib")
mark_as_advanced(CMAKE_AR)
mark_as_advanced(CMAKE_RANLIB)
Index: ne10-1.2.1/CMakeLists.txt
===================================================================
--- ne10-1.2.1.orig/CMakeLists.txt
+++ ne10-1.2.1/CMakeLists.txt
@@ -61,8 +61,9 @@ if(DEFINED NE10_ANDROID_TARGET_ARCH)
endif()
endif()
+#On debian this CPU arch is 'arm'
if(DEFINED NE10_LINUX_TARGET_ARCH)
- if(${NE10_LINUX_TARGET_ARCH} STREQUAL "armv7")
+ if(${NE10_LINUX_TARGET_ARCH} STREQUAL "arm")
set(NE10_TARGET_ARCH "armv7")
else()
set(NE10_TARGET_ARCH "aarch64")
|
