diff options
| author | Jason Perkins <starkos@industriousone.com> | 2013-08-08 22:13:20 +0400 |
|---|---|---|
| committer | Jason Perkins <starkos@industriousone.com> | 2013-08-08 22:13:20 +0400 |
| commit | 4b659ec54c38a1790de6078ae02d60d6d9ed0226 (patch) | |
| tree | ae46d59e64333eb300b62f0b5ad00c58eb7164cc /src | |
| parent | 99a23c9fccb0ce71a752289ffc20aaf27e217dfa (diff) | |
Swapped $(LIBS) and $(ALL_LDFLAGS) in makefile linking step (Ben Henning)
See http://sourceforge.net/p/premake/bugs/279/
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions/make/make_cpp.lua | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua index 0efd321..479e36d 100644 --- a/src/actions/make/make_cpp.lua +++ b/src/actions/make/make_cpp.lua @@ -267,11 +267,15 @@ _p(' LINKCMD = $(AR) -rcs $(TARGET) $(OBJECTS)') end else + -- this was $(TARGET) $(LDFLAGS) $(OBJECTS) - -- but had trouble linking to certain static libs so $(OBJECTS) moved up - -- then $(LDFLAGS) moved to end - -- https://sourceforge.net/tracker/?func=detail&aid=3430158&group_id=71616&atid=531880 - _p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(LIBS) $(ALL_LDFLAGS)', iif(cfg.language == "C", "CC", "CXX")) + -- but had trouble linking to certain static libs; $(OBJECTS) moved up + -- $(LDFLAGS) moved to end (http://sourceforge.net/p/premake/patches/107/) + -- $(LIBS) moved to end (http://sourceforge.net/p/premake/bugs/279/) + + local tool = iif(cfg.language == "C", "CC", "CXX") + _p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool) + end end |