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

linux regression

Browse Source
This commit is contained in:
Reece Wilson 2024-02-23 11:32:13 +00:00
parent b6e035aa35
commit 9167ce10a2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gmake2/gmake2_cpp.lua
View File

@ -454,8 +454,12 @@
-- 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/)
p.outln('LINKCMD = -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
if (os.host() == "windows") then
p.outln('LINKCMD = -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
else
local cc = iif(p.languages.isc(cfg.language), "CC", "CXX")
p.outln('LINKCMD = $(' .. cc .. ') -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)')
end
end
end
@ -666,8 +670,12 @@
_p('$(TARGET): %s | $(TARGETDIR)', targets)
_p('\t$(PRELINKCMDS)')
_p('\t@echo Linking %s', cfg.project.name)
_p('\t$(file > $(OBJDIR)/linkcmds.cli, $(LINKCMD))')
_p('\t$(' .. cc .. ') @$(OBJDIR)/linkcmds.cli')
if (os.host() == "windows") then
_p('\t$(file > $(OBJDIR)/linkcmds.cli, $(LINKCMD))')
_p('\t$(' .. cc .. ') @$(OBJDIR)/linkcmds.cli')
else
_p('\t$(SILENT) $(LINKCMD)')
end
_p('\t$(POSTBUILDCMDS)')
_p('')
end