Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 08:22:15 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

disabled some GCC-specific hacks in sdl.mak when clang is being used / also silenced linker for DISTRO=ubuntu-intrepid (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2013-03-20 17:54:09 +00:00
parent 90362d4baf
commit 9e90158d7d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osd/sdl/sdl.mak
View File

@ -128,7 +128,7 @@ else
ifeq ($(DISTRO),ubuntu-intrepid)
# Force gcc-4.2 on ubuntu-intrepid
CC = @gcc -V 4.2
LD = g++-4.2
LD = @g++-4.2
else
ifeq ($(DISTRO),gcc44-generic)
CC = @gcc-4.4
@ -439,6 +439,7 @@ SDLOS_TARGETOS = $(BASE_TARGETOS)
# TEST_GCC for GCC version-specific stuff
#-------------------------------------------------
ifeq (,$(findstring clang,$(CC)))
# TODO: needs to use $(CC)
TEST_GCC = $(shell gcc --version)
@ -456,6 +457,7 @@ endif
ifeq ($(findstring 4.7.,$(TEST_GCC)),4.7.)
CCOMFLAGS += -Wno-narrowing -Wno-attributes
endif
endif
#-------------------------------------------------
# Unix
@ -599,10 +601,12 @@ endif
# Static linking
LDFLAGS += -static-libgcc
ifeq (,$(findstring clang,$(CC)))
ifeq ($(findstring 4.4,$(TEST_GCC)),)
#if we use new tools
LDFLAGS += -static-libstdc++
endif
endif
ifndef NO_USE_QTDEBUG
MOC = @moc