|
40 | 40 | FIND=find
|
41 | 41 | endif
|
42 | 42 |
|
| 43 | +RPI_DETECTED := $(shell grep -qi 'Raspberry' /proc/device-tree/model && echo yes || echo no) |
| 44 | +JETSON_DETECTED := $(shell grep -qi -e 'Jetson' -e 'Tegra' /proc/device-tree/model && echo yes || echo no) |
| 45 | + |
43 | 46 | #check for Raspbian as armv7l needs to use armv6l architecture
|
44 | 47 | ifeq ($(wildcard $(RPI_ROOT)/etc/*-release), /etc/os-release)
|
45 | 48 | ifeq ($(shell grep ID=raspbian $(RPI_ROOT)/etc/*-release),ID=raspbian)
|
@@ -77,33 +80,41 @@ ifdef MAKEFILE_DEBUG
|
77 | 80 | $(info CROSS_COMPILING=$(CROSS_COMPILING))
|
78 | 81 | $(info PLATFORM_VARIANT=$(PLATFORM_VARIANT))
|
79 | 82 | $(info IS_RASPBIAN=$(IS_RASPBIAN))
|
| 83 | + $(info IS_RASPBIAN=$(IS_RASPBIAN)) |
80 | 84 | endif
|
81 | 85 |
|
82 | 86 | # if not defined, construct the default PLATFORM_LIB_SUBPATH
|
83 | 87 | ifndef PLATFORM_LIB_SUBPATH
|
84 | 88 | # determine from the arch
|
85 | 89 | ifeq ($(PLATFORM_OS),Linux)
|
86 |
| - ifeq ($(PLATFORM_ARCH),x86_64) |
87 |
| - PLATFORM_LIB_SUBPATH=linux/64 |
88 |
| - else ifeq ($(PLATFORM_ARCH),64) |
89 |
| - PLATFORM_LIB_SUBPATH=linux/64 |
90 |
| - else ifeq ($(PLATFORM_ARCH),armv6l) |
91 |
| - PLATFORM_LIB_SUBPATH=linux/armv6l |
92 |
| - else ifeq ($(PLATFORM_ARCH),armv7l) |
93 |
| - PLATFORM_LIB_SUBPATH=linux/armv7l |
94 |
| - else ifeq ($(PLATFORM_ARCH),armv8l) |
95 |
| - PLATFORM_LIB_SUBPATH=linux/armv8l |
96 |
| - else ifeq ($(PLATFORM_ARCH),arm64) |
97 |
| - PLATFORM_LIB_SUBPATH=linux/arm64 |
98 |
| - else ifeq ($(PLATFORM_ARCH),aarch64) |
99 |
| - PLATFORM_LIB_SUBPATH=linux/aarch64 |
100 |
| - else ifeq ($(PLATFORM_ARCH),jetson) |
| 90 | + ifeq ($(RPI_DETECTED),yes) |
| 91 | + else ifeq ($(PLATFORM_ARCH),armv6l) |
| 92 | + PLATFORM_LIB_SUBPATH=linux/armv6l |
| 93 | + else ifeq ($(PLATFORM_ARCH),armv7l) |
| 94 | + PLATFORM_LIB_SUBPATH=linux/armv7l |
| 95 | + else ifeq ($(PLATFORM_ARCH),armv8l) |
| 96 | + PLATFORM_LIB_SUBPATH=linux/armv8l |
| 97 | + else ifeq ($(PLATFORM_ARCH),arm64) |
| 98 | + PLATFORM_LIB_SUBPATH=linux/arm64 |
| 99 | + else ifeq ($(PLATFORM_ARCH),aarch64) |
| 100 | + PLATFORM_LIB_SUBPATH=linux/aarch64 |
| 101 | + else ifeq ($(JETSON_DETECTED),yes) |
101 | 102 | PLATFORM_LIB_SUBPATH=linux/jetson
|
102 |
| - else ifeq ($(PLATFORM_ARCH),i386) |
103 |
| - PLATFORM_LIB_SUBPATH=linux |
104 | 103 | else
|
105 |
| - PLATFORM_LIB_SUBPATH=linux |
106 |
| - $(error This makefile does not support your architecture $(PLATFORM_ARCH)) |
| 104 | + ifeq ($(PLATFORM_ARCH),x86_64) |
| 105 | + PLATFORM_LIB_SUBPATH=linux/64 |
| 106 | + else ifeq ($(PLATFORM_ARCH),64) |
| 107 | + PLATFORM_LIB_SUBPATH=linux/64 |
| 108 | + else ifeq ($(PLATFORM_ARCH),arm64) |
| 109 | + PLATFORM_LIB_SUBPATH=linux/arm64 |
| 110 | + else ifeq ($(PLATFORM_ARCH),aarch64) |
| 111 | + PLATFORM_LIB_SUBPATH=linux/arm64 |
| 112 | + else ifeq ($(PLATFORM_ARCH),i386) |
| 113 | + PLATFORM_LIB_SUBPATH=linux/i386 |
| 114 | + else |
| 115 | + PLATFORM_LIB_SUBPATH=linux |
| 116 | + $(error This makefile does not support your architecture $(PLATFORM_ARCH)) |
| 117 | + endif |
107 | 118 | endif
|
108 | 119 | SHARED_LIB_EXTENSION=so
|
109 | 120 | else ifneq (,$(findstring MINGW32_NT,$(PLATFORM_OS)))
|
|
0 commit comments