nortti/sortix-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix linking C++ base programs on new toolchains with -nostdlib++.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2024-08-28 11:47:31 +02:00
parent 82fa95f8cd
commit c05a00c718
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build-aux/compiler.mak
View file

@ -130,3 +130,7 @@ DEFAULT_OPTLEVEL:=$(DEFAULT_GENERIC_OPTLEVEL_BASE)
ifeq ($(HOST_IS_SORTIX),1)
DEFAULT_OPTLEVEL+=
endif
# TODO: After releasing Sortix 1.1, drop support for gcc 5.2.0 and use the
# -nostdlibc++ option unconditionally.
NOSTDLIBCXX=$(shell if [ 13 -le `$(CC) -dumpversion | grep -Eo '^[0-9]+'` ]; then echo -nostdlib++; fi)

2
ext/Makefile
View file

@ -7,7 +7,7 @@ OPTLEVEL?=$(DEFAULT_OPTLEVEL)
CXXFLAGS?=$(OPTLEVEL)
CPPFLAGS:=$(CPPFLAGS) -DVERSIONSTR=\"$(VERSION)\"
CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti -fcheck-new
CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti -fcheck-new $(NOSTDLIBCXX)
LIBS:=$(LIBS)

2
games/Makefile
View file

@ -9,7 +9,7 @@ CFLAGS?=$(OPTLEVEL)
CXXFLAGS?=$(OPTLEVEL)
CFLAGS:=$(CFLAGS) -Wall -Wextra
CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti -fcheck-new
CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti -fcheck-new $(NOSTDLIBCXX)
BINARIES:=\
asteroids \

2
trianglix/Makefile
View file

@ -7,7 +7,7 @@ include ../build-aux/dirs.mak
OPTLEVEL?=-g -O2
CXXFLAGS?=$(OPTLEVEL)
CXXFLAGS:=$(CXXFLAGS) -std=gnu++11 -Wall -Wextra -fno-exceptions -fno-rtti -fcheck-new
CXXFLAGS:=$(CXXFLAGS) -std=gnu++11 -Wall -Wextra -fno-exceptions -fno-rtti -fcheck-new $(NOSTDLIBCXX)
BINARY:=trianglix