Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile wholearchive responsefile support #458

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Makefile wholearchive responsefile support #458

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
daaad72
Add gmake macro 'FPRINT'
KageKirin Jul 3, 2019
a76bf71
Change attfile generation to 1 echo per entry
KageKirin Jul 1, 2019
b5a3826
Update scripts.c
KageKirin Jul 1, 2019
dd48f3a
Add make variables blank, comma and space for use in substitutions
KageKirin Jul 11, 2019
4864955
Add space after echo. in FPRINT
KageKirin Jul 11, 2019
66f9284
Add handling of wholearchive lddeps as different variable
KageKirin Jul 11, 2019
89f4164
Add macro 'CAT' to print files to stdout
KageKirin Jul 11, 2019
05d5c07
Use macro 'CAT' to print contents of generated responsefiles
KageKirin Jul 11, 2019
5ac4e30
Update scripts.c
KageKirin Jul 11, 2019
7176d25
Undo changes to wholearchive lddeps as different variable.
KageKirin Jul 24, 2019
c9745c2
Change rule generation for 'ldresp'
KageKirin Jul 24, 2019
23e33e1
Update scripts.c
KageKirin Jul 24, 2019
37bcdfc
Change OBJRESP and LDRESP filenames to depend on TARGET name
KageKirin Jul 26, 2019
a40f0eb
Update scripts.c
KageKirin Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 54 additions & 18 deletions src/actions/make/make_cpp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
end

-- target build rule
_p('$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS)')
_p('$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) $(LDWARESP) | $(TARGETDIR) $(OBJDIRS)')

if prj.kind == "StaticLib" then
if prj.msgarchiving then
Expand Down Expand Up @@ -239,14 +239,23 @@
_p('endif')
_p('')

_p('blank =')
_p('comma =,')
_p('space = ')
_p('space += ')
_p('')
_p('ifeq (posix,$(SHELLTYPE))')
_p(' MKDIR = $(SILENT) mkdir -p "$(1)"')
_p(' COPY = $(SILENT) cp -fR "$(1)" "$(2)"')
_p(' RM = $(SILENT) rm -f "$(1)"')
_p(' MKDIR = $(SILENT) mkdir -p "$(1)"')
_p(' COPY = $(SILENT) cp -fR "$(1)" "$(2)"')
_p(' RM = $(SILENT) rm -f "$(1)"')
_p(' FPRINT = $(shell echo $(1)$(2) "$(3)")')
_p(' CAT = $(SILENT) cat "$(1)"')
_p('else')
_p(' MKDIR = $(SILENT) mkdir "$(subst /,\\\\,$(1))" 2> nul || exit 0')
_p(' COPY = $(SILENT) copy /Y "$(subst /,\\\\,$(1))" "$(subst /,\\\\,$(2))"')
_p(' RM = $(SILENT) del /F "$(subst /,\\\\,$(1))" 2> nul || exit 0')
_p(' MKDIR = $(SILENT) mkdir "$(subst /,\\\\,$(1))" 2> nul || exit 0')
_p(' COPY = $(SILENT) copy /Y "$(subst /,\\\\,$(1))" "$(subst /,\\\\,$(2))"')
_p(' RM = $(SILENT) del /F "$(subst /,\\\\,$(1))" 2> nul || exit 0')
_p(' FPRINT = $(shell echo. $(1)$(2) "$(subst /,\\\\,$(3))")')
_p(' CAT = $(SILENT) type "$(subst /,\\\\,$(1))"')
_p('endif')
_p('')

Expand Down Expand Up @@ -439,16 +448,18 @@
function cpp.linker(prj, cfg, cc)
local libdeps
local lddeps
local ldwadeps

if #cfg.wholearchive > 0 then
libdeps = {}
lddeps = {}
libdeps = {}
lddeps = {}
ldwadeps = {}

for _, linkcfg in ipairs(premake.getlinks(cfg, "siblings", "object")) do
local linkpath = path.rebase(linkcfg.linktarget.fullpath, linkcfg.location, cfg.location)

if table.icontains(cfg.wholearchive, linkcfg.project.name) then
lddeps = table.join(lddeps, cc.wholearchive(linkpath))
table.insert(ldwadeps, linkpath)
else
table.insert(lddeps, linkpath)
end
Expand All @@ -458,21 +469,32 @@

libdeps = make.list(_MAKE.esc(libdeps))
lddeps = make.list(_MAKE.esc(lddeps))
ldwadeps = make.list(_MAKE.esc(ldwadeps))
else
libdeps = make.list(_MAKE.esc(premake.getlinks(cfg, "siblings", "fullpath")))
lddeps = libdeps
libdeps = make.list(_MAKE.esc(premake.getlinks(cfg, "siblings", "fullpath")))
lddeps = libdeps
ldwadeps = ""
end

_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))
_p(' LIBDEPS +=%s', libdeps)
_p(' LDDEPS +=%s', lddeps)
_p(' LDWADEPS +=%s', ldwadeps)

if cfg.flags.UseLDResponseFile then
_p(' LDRESP = $(OBJDIR)/%s_libs', prj.name)
_p(' LIBS += @$(LDRESP)%s', make.list(cc.getlinkflags(cfg)))
_p(' LDWARESP = $(OBJDIR)/%s_wholearchives', prj.name)
_p(' LIBS += @$(LDWARESP) @$(LDRESP)%s', make.list(cc.getlinkflags(cfg)))
KageKirin marked this conversation as resolved.
Show resolved Hide resolved
else
_p(' LDRESP =')
_p(' LIBS += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))
_p(' LDWARESP =')
if ldwadeps then
ldwadeps = "$(foreach v,$(LDWADEPS),-Wl$(comma)--whole-archive $(v) -Wl$(comma)--no-whole-archive)"
if premake.gcc.llvm then
ldwadeps = "$(foreach v,$(LDWADEPS),-force_load $(v))"
end
end
_p(' LIBS += %s $(LDDEPS)%s', ldwadeps or "", make.list(cc.getlinkflags(cfg)))
end

_p(' EXTERNAL_LIBS +=%s', make.list(cc.getlibfiles(cfg)))
Expand Down Expand Up @@ -579,15 +601,29 @@

_p('ifneq (,$(OBJRESP))')
_p('$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)')
_p('\t$(SILENT) echo $^')
_p('\t$(SILENT) echo $^ > $@')
_p('\t$(call FPRINT,,>,$@)')
_p('\t$(foreach v,$^,$(call FPRINT,$(v),>>,$@))')
_p('\t$(call CAT,$@)')
_p('endif')
_p('')

_p('ifneq (,$(LDRESP))')
_p('$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)')
_p('\t$(SILENT) echo $^')
_p('\t$(SILENT) echo $^ > $@')
_p('\t$(call FPRINT,,>,$@)')
_p('\t$(foreach v,$^,$(call FPRINT,$(v),>>,$@))')
_p('\t$(call CAT,$@)')
_p('endif')
_p('')

_p('ifneq (,$(LDWARESP))')
_p('$(LDWARESP): $(LDWADEPS) | $(TARGETDIR) $(OBJDIRS)')
_p('\t$(call FPRINT,,>,$@)')
if premake.gcc.llvm then
_p('\t$(foreach v,$^,$(call FPRINT,-force_load $(v),>>,$@))')
else
_p('\t$(foreach v,$^,$(call FPRINT,-Wl$(comma)--whole-archive $(v) -Wl$(comma)--no-whole-archive,>>,$@))')
end
_p('\t$(call CAT,$@)')
_p('endif')
_p('')

Expand Down
Loading