patch-Makefile_common 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. $OpenBSD: patch-Makefile_common,v 1.3 2017/05/31 08:10:01 espie Exp $
  2. Index: Makefile.common
  3. --- Makefile.common.orig
  4. +++ Makefile.common
  5. @@ -28,14 +28,6 @@ PKG_CONFIG=pkg-config
  6. DONT_PRINT = > /dev/null 2>&1
  7. DONT_FAIL = ; exit 0
  8. -# Override defaults that absolutely will not work.
  9. -ifeq ($(CC),cc)
  10. - override CC=gcc
  11. -endif
  12. -ifeq ($(AS),as)
  13. - override AS=nasm
  14. -endif
  15. -
  16. COBJC=$(CC) -x objective-c
  17. COBJCXX=$(CXX) -x objective-c++
  18. L_CC=$(CC)
  19. @@ -283,14 +275,9 @@ GUI_LIBS=
  20. LIBDIRS=
  21. ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
  22. - F_NO_STACK_PROTECTOR := -fno-stack-protector
  23. - # there are some link-time issues with stack protectors, so make it possible to override
  24. - F_STACK_PROTECTOR_ALL ?= -fstack-protector-all
  25. ifeq (0,$(CLANG))
  26. F_JUMP_TABLES := -fjump-tables
  27. endif
  28. - M_TUNE_GENERIC := -mtune=generic
  29. - M_STACKREALIGN := -mstackrealign
  30. endif
  31. W_STRICT_OVERFLOW := -Wno-strict-overflow
  32. @@ -663,10 +650,6 @@ DLLSUFFIX=.so
  33. SDL_TARGET ?= 2
  34. SDL_FRAMEWORK ?= 0
  35. -
  36. -ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 4)))
  37. - L_SSP := -lssp
  38. -endif
  39. # ifeq (1,$(strip $(shell expr $(GCC_MAJOR) \>= 5)))
  40. # ifneq (0,$(LTO))