mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
38 lines
1 KiB
Diff
38 lines
1 KiB
Diff
|
From 4e7b7b1124bfbccb43820997164b00720bf5ca31 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florian Gilcher <florian.gilcher@asquera.de>
|
||
|
|
Date: Sun, 23 Mar 2014 23:05:44 +0100
|
||
|
|
Subject: [PATCH] Remove GCC specific flags
|
||
|
|
|
||
|
|
---
|
||
|
|
Makefile.am | 10 ++--------
|
||
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index f1e872b..c011f02 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -69,11 +69,7 @@ AM_CFLAGS = \
|
||
|
|
AM_CPPFLAGS = \
|
||
|
|
-include $(top_builddir)/config.h \
|
||
|
|
-I $(srcdir)/src
|
||
|
|
-AM_LDFLAGS = \
|
||
|
|
- -Wl,--as-needed \
|
||
|
|
- -Wl,--gc-sections \
|
||
|
|
- -Wl,-z,relro \
|
||
|
|
- -Wl,-z,now
|
||
|
|
+AM_LDFLAGS =
|
||
|
|
|
||
|
|
if BUILD_ENABLE_DEBUG
|
||
|
|
AM_CFLAGS += -g
|
||
|
|
@@ -134,9 +130,7 @@ libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)
|
||
|
|
libtsm_la_LIBADD = libshl.la
|
||
|
|
EXTRA_libtsm_la_DEPENDENCIES = $(top_srcdir)/docs/libtsm.sym
|
||
|
|
libtsm_la_LDFLAGS = \
|
||
|
|
- $(AM_LDFLAGS) \
|
||
|
|
- -version-info $(LIBTSM_CURRENT):$(LIBTSM_REVISION):$(LIBTSM_AGE) \
|
||
|
|
- -Wl,--version-script="$(top_srcdir)/docs/libtsm.sym"
|
||
|
|
+ $(AM_LDFLAGS)
|
||
|
|
|
||
|
|
if BUILD_HAVE_XKBCOMMON
|
||
|
|
libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)
|