From b0f96e350a1aade0576625e4903c5fc1fa2b398d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 21 Dec 2011 17:14:11 +0100 Subject: [PATCH] Makefile.am (AM_CXXFLAGS): Put $(XCFLAGS) first. * Makefile.am (AM_CXXFLAGS): Put $(XCFLAGS) first. * Makefile.in: Regenerated. From-SVN: r182593 --- libitm/ChangeLog | 5 +++++ libitm/Makefile.am | 4 ++-- libitm/Makefile.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libitm/ChangeLog b/libitm/ChangeLog index ff93a53ba9f..95969826dae 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,8 @@ +2011-12-21 Jakub Jelinek + + * Makefile.am (AM_CXXFLAGS): Put $(XCFLAGS) first. + * Makefile.in: Regenerated. + 2011-12-17 Kaz Kojima * configure.tgt: Add sh* case. diff --git a/libitm/Makefile.am b/libitm/Makefile.am index d41702614fd..b4ee5a84a19 100644 --- a/libitm/Makefile.am +++ b/libitm/Makefile.am @@ -18,8 +18,8 @@ vpath % $(strip $(search_path)) AM_CPPFLAGS = $(addprefix -I, $(search_path)) AM_CFLAGS = $(XCFLAGS) -AM_CXXFLAGS = -std=gnu++0x -funwind-tables -fno-exceptions -fno-rtti \ - $(XCFLAGS) $(abi_version) +AM_CXXFLAGS = $(XCFLAGS) -std=gnu++0x -funwind-tables -fno-exceptions \ + -fno-rtti $(abi_version) AM_CCASFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) diff --git a/libitm/Makefile.in b/libitm/Makefile.in index 5305f4ce8c5..20961095e37 100644 --- a/libitm/Makefile.in +++ b/libitm/Makefile.in @@ -355,8 +355,8 @@ fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include AM_CPPFLAGS = $(addprefix -I, $(search_path)) AM_CFLAGS = $(XCFLAGS) -AM_CXXFLAGS = -std=gnu++0x -funwind-tables -fno-exceptions -fno-rtti \ - $(XCFLAGS) $(abi_version) +AM_CXXFLAGS = $(XCFLAGS) -std=gnu++0x -funwind-tables -fno-exceptions \ + -fno-rtti $(abi_version) AM_CCASFLAGS = $(XCFLAGS) AM_LDFLAGS = $(XLDFLAGS) $(SECTION_LDFLAGS) $(OPT_LDFLAGS) -- 2.30.2