JDierkse/Makefiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Default Architecture

Browse Source
This commit is contained in:
JDierkse
2020-09-03 10:00:09 +02:00
parent 5afd04e99b
commit be2883e29d
10 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+15 -9
View File
@@ -7,6 +7,11 @@
ROOTPATH := $(shell git rev-parse --show-toplevel) ROOTPATH := $(shell git rev-parse --show-toplevel)
COMMANDLINE := $(shell ps -o args= $$PPID) COMMANDLINE := $(shell ps -o args= $$PPID)
# ---------- Base Includes ----------
-include $(ROOTPATH)/Makefile.conf
-include $(ROOTPATH)/Makefiles/Makefile.conf.base
# ---------- Architectures ---------- # ---------- Architectures ----------
ARCHS := $(shell ls $(ROOTPATH)/Makefiles/Makefile.conf.* | grep -v base | sed 's/.*Makefile\.conf\.//g') ARCHS := $(shell ls $(ROOTPATH)/Makefiles/Makefile.conf.* | grep -v base | sed 's/.*Makefile\.conf\.//g')
@@ -16,6 +21,16 @@ ARCHS += any
ARCHS := $(filter-out any,$(ARCHS)) ARCHS := $(filter-out any,$(ARCHS))
ifeq ($(ARCH),)
ifneq ($(DEFAULTARCH),)
ARCH := $(DEFAULTARCH)
else
ARCH := x86_64
endif
endif
-include $(ROOTPATH)/Makefiles/Makefile.conf.$(ARCH)
ifeq (,$(findstring -S,$(COMMANDLINE))) ifeq (,$(findstring -S,$(COMMANDLINE)))
ifneq ($(ARCH),) ifneq ($(ARCH),)
$(info ARCH: $(ARCH)) $(info ARCH: $(ARCH))
@@ -51,9 +66,6 @@ REALOBJECTS := $(SOURCES:.cpp=.o.$(ARCH))
DEPENDS = $(REALOBJECTS:.o.$(ARCH)=.d.$(ARCH)) DEPENDS = $(REALOBJECTS:.o.$(ARCH)=.d.$(ARCH))
OBJECTS := Makefile.conf OBJECTS := Makefile.conf
OBJECTS += $(REALOBJECTS) OBJECTS += $(REALOBJECTS)
LIBRARIES =
LIBFILES =
TARGETS =
# ---------- Recursive Targets ---------- # ---------- Recursive Targets ----------
@@ -66,12 +78,6 @@ artifacts: $(LOCALOBJECTS)
.DEFAULT_GOAL := artifacts .DEFAULT_GOAL := artifacts
# ---------- Includes ----------
-include $(ROOTPATH)/Makefiles/Makefile.conf.$(ARCH)
-include $(ROOTPATH)/Makefiles/Makefile.conf.base
-include $(ROOTPATH)/Makefile.conf
# ---------- Libraries ---------- # ---------- Libraries ----------
define build_target_library_arch define build_target_library_arch
Makefile.aliases
+14 -16
View File
@@ -2,39 +2,37 @@
# Makefile.conf.aliases # Makefile.conf.aliases
# #
ARCHS += armv6 ALIASES += armv6
ARCHS += armv8 ALIASES += armv8
ARCHS += alpine ALIASES += alpine
ARCHS += $(ALIASES)
ARCH := $(filter $(ARCHS),$(MAKECMDGOALS)) ARCH := $(filter $(ARCHS),$(MAKECMDGOALS))
MAKECMDGOALS := $(filter-out $(ARCH),$(MAKECMDGOALS)) MAKECMDGOALS := $(filter-out $(ARCH),$(MAKECMDGOALS))
# ARMv6 Defaults to Raspbian jessie # ARMv6 Defaults to Raspbian jessie
ifeq ($(ARCH),armv6) ifeq ($(ARCH),armv6)
ARCH := armv6-jessie ARCH := armv6-jessie
.PHONY: armv6 .PHONY: armv6
armv6: $(ARCH) armv6: $(ARCH)
endif endif
# ARMv8 Defaults to Raspbian stretch # ARMv8 Defaults to Raspbian stretch
ifeq ($(ARCH),armv8) ifeq ($(ARCH),armv8)
ARCH := armv8-stretch ARCH := armv8-stretch
.PHONY: armv8 .PHONY: armv8
armv8: $(ARCH) armv8: $(ARCH)
endif endif
# Alpine defaults to x86_64 alpine # Alpine defaults to x86_64 alpine
ifeq ($(ARCH),alpine) ifeq ($(ARCH),alpine)
ARCH := x86_64-alpine ARCH := x86_64-alpine
.PHONY: alpine .PHONY: alpine
alpine: $(ARCH) alpine: $(ARCH)
endif endif
# Default is x86_64 ARCHS := $(filter-out $(ALIASES),$(ARCHS))
ifeq ($(ARCH),)
ARCH := x86_64
endif
Makefile.conf.armv6-jessie
+2 -1
View File
@@ -3,7 +3,7 @@
# #
ARCH := armv6-jessie ARCH := armv6-jessie
CFLAGS := -marm -march=armv6 CFLAGS += -marm -march=armv6
ARCHBASEDIR := /opt/build/Raspbian-jessie ARCHBASEDIR := /opt/build/Raspbian-jessie
@@ -16,3 +16,4 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/include/arm-linux-gnueabihf
LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot
Makefile.conf.armv6-stretch
+2 -1
View File
@@ -3,7 +3,7 @@
# #
ARCH := armv6-stretch ARCH := armv6-stretch
CFLAGS := -marm -march=armv6 CFLAGS += -marm -march=armv6
ARCHBASEDIR := /opt/build/Raspbian-stretch ARCHBASEDIR := /opt/build/Raspbian-stretch
@@ -16,3 +16,4 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/include/arm-linux-gnueabihf
LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot
Makefile.conf.armv8-alpine
+2 -1
View File
@@ -3,7 +3,7 @@
# #
ARCH := armv8-alpine ARCH := armv8-alpine
CFLAGS := -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
ARCHBASEDIR := /opt/build/alpine ARCHBASEDIR := /opt/build/alpine
@@ -17,3 +17,4 @@ LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/arm-linux-musleabihf/lib -L$(ARC
LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/arm-linux-musleabihf/lib -Wl,-rpath,$(ARCHBASEDIR)/arm-linux-musleabihf/usr/lib LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/arm-linux-musleabihf/lib -Wl,-rpath,$(ARCHBASEDIR)/arm-linux-musleabihf/usr/lib
CFLAGS += -Wno-stringop-truncation CFLAGS += -Wno-stringop-truncation
Makefile.conf.armv8-jessie
+2 -1
View File
@@ -3,7 +3,7 @@
# #
ARCH := armv8-jessie ARCH := armv8-jessie
CFLAGS := -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
ARCHBASEDIR := /opt/build/Raspbian-jessie ARCHBASEDIR := /opt/build/Raspbian-jessie
@@ -16,3 +16,4 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/include/arm-linux-gnueabihf
LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot
Makefile.conf.armv8-stretch
+2 -1
View File
@@ -3,7 +3,7 @@
# #
ARCH := armv8-stretch ARCH := armv8-stretch
CFLAGS := -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8
ARCHBASEDIR := /opt/build/Raspbian-stretch ARCHBASEDIR := /opt/build/Raspbian-stretch
@@ -16,3 +16,4 @@ CFLAGS += -I$(ARCHBASEDIR)/include -I$(ARCHBASEDIR)/include/arm-linux-gnueabihf
LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -L$(ARCHBASEDIR)/usr/lib -L$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/lib/arm-linux-gnueabihf -Wl,-rpath,$(ARCHBASEDIR)/usr/lib -Wl,-rpath,$(ARCHBASEDIR)/usr/lib/arm-linux-gnueabihf
LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot LFLAGS += --sysroot $(ARCHBASEDIR)/tools/arm-rpi-linux-gnueabihf/sysroot
Makefile.conf.base
+1
View File
@@ -10,3 +10,4 @@ CFLAGS += -Wno-unused -Wno-variadic-macros -Wno-parentheses -Wno-unused-paramete
CFLAGS += -ffunction-sections -fdata-sections CFLAGS += -ffunction-sections -fdata-sections
LFLAGS += -Wl,--gc-sections LFLAGS += -Wl,--gc-sections
SFLAGS := -s -R .comment --strip-unneeded SFLAGS := -s -R .comment --strip-unneeded
Makefile.conf.x86_64
+1
View File
@@ -8,3 +8,4 @@ AR := ar
CC := g++ CC := g++
STRIP := strip STRIP := strip
OBJCOPY := objcopy OBJCOPY := objcopy
Makefile.conf.x86_64-alpine
+1
View File
@@ -16,3 +16,4 @@ LFLAGS += -L$(ARCHBASEDIR)/lib -L$(ARCHBASEDIR)/x86_64-linux-musl/lib -L$(ARCHBA
LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/usr/lib LFLAGS += -Wl,-rpath,$(ARCHBASEDIR)/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/lib -Wl,-rpath,$(ARCHBASEDIR)/x86_64-linux-musl/usr/lib
CFLAGS += -Wno-stringop-truncation CFLAGS += -Wno-stringop-truncation