brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only use -ffat-lto-objects for MOD builds, not all headless ones

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-02-08 18:52:23 +00:00
parent 2ed513866f
commit 59e7818b41
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -106,6 +106,10 @@ endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# MOD builds # MOD builds
ifeq ($(WITH_LTO),true)
EXTRA_MOD_FLAGS += -ffat-lto-objects
endif
MOD_WORKDIR ?= $(HOME)/mod-workdir MOD_WORKDIR ?= $(HOME)/mod-workdir
MOD_ENVIRONMENT = \ MOD_ENVIRONMENT = \
AR=${1}/host/usr/bin/${2}-gcc-ar \ AR=${1}/host/usr/bin/${2}-gcc-ar \
@ -115,10 +119,10 @@ MOD_ENVIRONMENT = \
LD=${1}/host/usr/bin/${2}-ld \ LD=${1}/host/usr/bin/${2}-ld \
PKG_CONFIG=${1}/host/usr/bin/pkg-config \ PKG_CONFIG=${1}/host/usr/bin/pkg-config \
STRIP=${1}/host/usr/bin/${2}-strip \ STRIP=${1}/host/usr/bin/${2}-strip \
CFLAGS="-I${1}/staging/usr/include -fsingle-precision-constant" \ CFLAGS="-I${1}/staging/usr/include -fsingle-precision-constant $(EXTRA_MOD_FLAGS)" \
CPPFLAGS= \ CPPFLAGS= \
CXXFLAGS="-I${1}/staging/usr/include -I../include/single-precision -fsingle-precision-constant -Wno-attributes" \ CXXFLAGS="-I${1}/staging/usr/include -I../include/single-precision -fsingle-precision-constant $(EXTRA_MOD_FLAGS) -Wno-attributes" \
LDFLAGS="-L${1}/staging/usr/lib" \ LDFLAGS="-L${1}/staging/usr/lib $(EXTRA_MOD_FLAGS)" \
EXE_WRAPPER="qemu-${3}-static -L ${1}/target" \ EXE_WRAPPER="qemu-${3}-static -L ${1}/target" \
HEADLESS=true \ HEADLESS=true \
MOD_BUILD=true \ MOD_BUILD=true \

3
src/Makefile
View file

@ -64,9 +64,6 @@ endif
ifeq ($(HEADLESS),true) ifeq ($(HEADLESS),true)
BASE_FLAGS += -DHEADLESS BASE_FLAGS += -DHEADLESS
ifeq ($(WITH_LTO),true)
BASE_FLAGS += -ffat-lto-objects
endif
endif endif
ifeq ($(BSD),true) ifeq ($(BSD),true)

3
src/Makefile.cardinal.mk
View file

@ -150,9 +150,6 @@ BASE_FLAGS += -pthread
ifeq ($(HEADLESS),true) ifeq ($(HEADLESS),true)
BASE_FLAGS += -DHEADLESS BASE_FLAGS += -DHEADLESS
ifeq ($(WITH_LTO),true)
BASE_FLAGS += -ffat-lto-objects
endif
endif endif
ifeq ($(WASM),true) ifeq ($(WASM),true)