AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #353 from starkos/rollback-link-groups

Browse Source 
Rollback link groups (-Wl,--start-group, -Wl,--end-group)
This commit is contained in:
Manu Evans 2015-12-04 10:53:02 +10:00
commit b4bc07f4ed
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/gcc.lua
View File

@ -296,13 +296,6 @@
end end
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 -- The "-l" flag is fine for system libraries
local links = config.getlinks(cfg, "system", "fullpath") local links = config.getlinks(cfg, "system", "fullpath")

2
tests/actions/make/cpp/test_make_linking.lua
View File

@ -178,7 +178,7 @@
prepare { "ldFlags", "libs", "ldDeps" } prepare { "ldFlags", "libs", "ldDeps" }
test.capture [[ test.capture [[
ALL_LDFLAGS += $(LDFLAGS) -s 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 LDDEPS += build/bin/Debug/libMyProject2.a build/bin/Debug/libMyProject3.a
]] ]]
end end