premake/patches/709.patch
changeset 7925 f090a47eb7f7
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/premake/patches/709.patch	Sun Nov 10 00:38:37 2013 -0500
     1.3 @@ -0,0 +1,29 @@
     1.4 +# HG changeset patch
     1.5 +# User Ben Henning
     1.6 +# Date 1375901577 25200
     1.7 +#      Wed Aug 07 11:52:57 2013 -0700
     1.8 +# Node ID 1d820b5754a9bc79b5c4c6a26d1acc170ebf4784
     1.9 +# Parent  0af3bf0e3755477eafb247935db77b2765df2d19
    1.10 +Updated the GCC make option to handle its linker cmomand generation a bit
    1.11 +differently. Rather than putting the sibling libraries before the linker
    1.12 +flags, they are put after. This allows for some extra flexibility in putting
    1.13 +custom linker libraries before the list of sibling libraries, in case one of
    1.14 +them depends on it.
    1.15 +
    1.16 +diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua
    1.17 +--- a/src/actions/make/make_cpp.lua
    1.18 ++++ b/src/actions/make/make_cpp.lua
    1.19 +@@ -267,11 +267,12 @@
    1.20 + 				_p('  LINKCMD    = $(AR) -rcs $(TARGET) $(OBJECTS)')
    1.21 + 			end
    1.22 + 		else
    1.23 ++			-- Ben: changed order of ALL_LDFLAGS and LIBS (switched them)
    1.24 + 			-- this was $(TARGET) $(LDFLAGS) $(OBJECTS)
    1.25 + 			--  but had trouble linking to certain static libs so $(OBJECTS) moved up
    1.26 + 			-- then $(LDFLAGS) moved to end
    1.27 + 			--   https://sourceforge.net/tracker/?func=detail&aid=3430158&group_id=71616&atid=531880
    1.28 +-			_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(ALL_LDFLAGS)', iif(cfg.language == "C", "CC", "CXX"))
    1.29 ++			_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', iif(cfg.language == "C", "CC", "CXX"))
    1.30 + 		end
    1.31 + 	end
    1.32 +