From 4b629acda09c6fa7489ba8e9fb05402908ad83d7 Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Thu, 3 Dec 2015 07:04:00 -0500 Subject: [PATCH] Rollback link groups (-Wl,--start-group, -Wl,--end-group) The --start-group and --end-group flags cause issues for anyone using alternate linkers with GCC or Clang. We need to come up with a better solution. --- src/tools/gcc.lua | 7 ------- tests/actions/make/cpp/test_make_linking.lua | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/tools/gcc.lua b/src/tools/gcc.lua index b2340108..c1263231 100644 --- a/src/tools/gcc.lua +++ b/src/tools/gcc.lua @@ -296,13 +296,6 @@ end end - if cfg.system ~= premake.MACOSX then - if #result > 1 then - table.insert(result, 1, "-Wl,--start-group") - table.insert(result, "-Wl,--end-group") - end - end - -- The "-l" flag is fine for system libraries local links = config.getlinks(cfg, "system", "fullpath") diff --git a/tests/actions/make/cpp/test_make_linking.lua b/tests/actions/make/cpp/test_make_linking.lua index d8485b6a..0e17476a 100644 --- a/tests/actions/make/cpp/test_make_linking.lua +++ b/tests/actions/make/cpp/test_make_linking.lua @@ -178,7 +178,7 @@ prepare { "ldFlags", "libs", "ldDeps" } test.capture [[ ALL_LDFLAGS += $(LDFLAGS) -s - LIBS += -Wl,--start-group build/bin/Debug/libMyProject2.a build/bin/Debug/libMyProject3.a -Wl,--end-group + LIBS += build/bin/Debug/libMyProject2.a build/bin/Debug/libMyProject3.a LDDEPS += build/bin/Debug/libMyProject2.a build/bin/Debug/libMyProject3.a ]] end