From c1b9104d54814b4084e0d7b113918a6d014e807e Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sat, 12 May 2018 11:41:12 +0200 Subject: [PATCH] Makefile: Remove unnecessary -no-pie for older GCC support Currently, if: * GCC doesn't supports -no-pie: Build error * GCC supports -no-pie * GCC is not configured with --enable-default-pie: No-op * GCC is configured with --enable-default-pie: Slightly worse performance because we still generate -fpie code (-pie affects linker, -fpie affects compiler) So instead of probing for existence of -fno-pie -no-pie, remove it altogether. Fixes #540: Build breakage on Debian 8 with gcc 4.9. --- examples/Makefile | 2 +- games/Makefile | 2 +- games/drturtle/Makefile | 2 +- games/just_do/Makefile | 2 +- games/koala_seasons/Makefile | 2 +- games/light_my_ritual/Makefile | 2 +- games/skully_escape/Makefile | 2 +- games/transmission/Makefile | 2 +- games/wave_collector/Makefile | 2 +- templates/advance_game/Makefile | 2 +- templates/simple_game/Makefile | 2 +- templates/standard_game/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index d283e807..64cec3d1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -215,7 +215,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) #CC = clang endif ifeq ($(RAYLIB_LIBTYPE),STATIC) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif ifeq ($(RAYLIB_LIBTYPE),SHARED) # Explicitly enable runtime link to libraylib.so diff --git a/games/Makefile b/games/Makefile index b00f4382..c14ff36c 100644 --- a/games/Makefile +++ b/games/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/drturtle/Makefile b/games/drturtle/Makefile index bbc71eb9..242d0c5c 100644 --- a/games/drturtle/Makefile +++ b/games/drturtle/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/just_do/Makefile b/games/just_do/Makefile index 0237f4f9..d5481e51 100644 --- a/games/just_do/Makefile +++ b/games/just_do/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/koala_seasons/Makefile b/games/koala_seasons/Makefile index 25e6dcbe..3dd299fd 100644 --- a/games/koala_seasons/Makefile +++ b/games/koala_seasons/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/light_my_ritual/Makefile b/games/light_my_ritual/Makefile index f6fd4533..cdd96129 100644 --- a/games/light_my_ritual/Makefile +++ b/games/light_my_ritual/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/skully_escape/Makefile b/games/skully_escape/Makefile index 98d4696a..74521e7b 100644 --- a/games/skully_escape/Makefile +++ b/games/skully_escape/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/transmission/Makefile b/games/transmission/Makefile index 4e998f0f..2ba9afd9 100644 --- a/games/transmission/Makefile +++ b/games/transmission/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/games/wave_collector/Makefile b/games/wave_collector/Makefile index 78b2bbe5..9f03e62e 100644 --- a/games/wave_collector/Makefile +++ b/games/wave_collector/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index 181f9dfb..61a59bc2 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile index 4cd435ea..1b512670 100644 --- a/templates/simple_game/Makefile +++ b/templates/simple_game/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI) diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile index e18703b2..7046233c 100644 --- a/templates/standard_game/Makefile +++ b/templates/standard_game/Makefile @@ -163,7 +163,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) CFLAGS += $(RAYLIB_PATH)/src/raylib_icon -Wl,--subsystem,windows endif ifeq ($(PLATFORM_OS),LINUX) - CFLAGS += -no-pie -D_DEFAULT_SOURCE + CFLAGS += -D_DEFAULT_SOURCE endif endif ifeq ($(PLATFORM),PLATFORM_RPI)