[GRASS-SVN] r65593 - grass/branches/releasebranch_7_0/include/Make

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jul 15 01:24:44 PDT 2015


Author: martinl
Date: 2015-07-15 01:24:44 -0700 (Wed, 15 Jul 2015)
New Revision: 65593

Modified:
   grass/branches/releasebranch_7_0/include/Make/Compile.make
Log:
Compile.make: change order of ldflags (gcc 4.8+ is more sensitive)
              (merge r65245 from trunk)


Modified: grass/branches/releasebranch_7_0/include/Make/Compile.make
===================================================================
--- grass/branches/releasebranch_7_0/include/Make/Compile.make	2015-07-15 08:01:09 UTC (rev 65592)
+++ grass/branches/releasebranch_7_0/include/Make/Compile.make	2015-07-15 08:24:44 UTC (rev 65593)
@@ -15,7 +15,7 @@
 endif
 
 linker_base = $(PRELINK) && $(1) $(2) -o $@ $(filter %.o,$^) $(filter %.res,$^) $(3)
-linker_x = $(call linker_base,$(1),$(LDFLAGS) $(EXTRA_LDFLAGS),$(FMODE_OBJ) $(MANIFEST_OBJ) $(LIBES) $(EXTRA_LIBS) $(MATHLIB))
+linker_x = $(call linker_base,$(1),$(LDFLAGS),$(FMODE_OBJ) $(MANIFEST_OBJ) $(LIBES) $(EXTRA_LDFLAGS) $(EXTRA_LIBS) $(MATHLIB))
 linker_c = $(call linker_x,$(CC))
 linker_cxx = $(call linker_x,$(CXX))
 linker = $(call linker_x,$(LINK))



More information about the grass-commit mailing list