From 18d998034d8d215b8523bbdf4af0f5efb7e5035e Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 31 Dec 2019 02:54:06 -0800 Subject: [PATCH] buildsystem: more fixes --- libraries/config/common.mk | 2 +- libraries/config/templates/mesosphere.mk | 2 +- libraries/config/templates/stratosphere.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/config/common.mk b/libraries/config/common.mk index 812d2e968..937e10d2c 100644 --- a/libraries/config/common.mk +++ b/libraries/config/common.mk @@ -76,7 +76,7 @@ TARGET := $(notdir $(CURDIR)) BUILD := build DATA := data INCLUDES := include -SOURCES ?= $(foreach sd,$(filter-out source/arch source/board,$(wildcard source/.*)),$(call DIR_WILDCARD,$sd)) +SOURCES ?= $(foreach d,$(filter-out source/arch source/board,$(wildcard source)),$(call DIR_WILDCARD,$d) $d) ifneq ($(strip $(wildcard source/$(ATMOSPHERE_ARCH_DIR)/.*)),) SOURCES += $(call DIR_WILDCARD,source/$(ATMOSPHERE_ARCH_DIR)) diff --git a/libraries/config/templates/mesosphere.mk b/libraries/config/templates/mesosphere.mk index b173de220..39301c66a 100644 --- a/libraries/config/templates/mesosphere.mk +++ b/libraries/config/templates/mesosphere.mk @@ -10,7 +10,7 @@ export DEFINES := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_MESOSPHERE export SETTINGS := $(ATMOSPHERE_SETTINGS) -O2 -mgeneral-regs-only -ffixed-x18 -Werror export CFLAGS := $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE) export CXXFLAGS := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -export ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) +export ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) $(DEFINES) export LDFLAGS = -specs=$(TOPDIR)/kernel_ldr.specs -nostdlib -nostartfiles -g $(SETTINGS) -Wl,-Map,$(notdir $*.map) diff --git a/libraries/config/templates/stratosphere.mk b/libraries/config/templates/stratosphere.mk index a876019d9..5f870dcb2 100644 --- a/libraries/config/templates/stratosphere.mk +++ b/libraries/config/templates/stratosphere.mk @@ -19,7 +19,7 @@ export DEFINES := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_STRATOSPHERE export SETTINGS := $(ATMOSPHERE_SETTINGS) -O2 export CFLAGS := $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE) export CXXFLAGS := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -export ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) +export ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) $(DEFINES) export CXXWRAPS := -Wl,--wrap,__cxa_pure_virtual \ -Wl,--wrap,__cxa_throw \