doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Defer expansion of variable shared.ldflags

Browse source 
Fixes issue #64 ("shared.ldflags broken when building with
helper-library"), a regression introduced with commit
a6975e91 ("Reorder makefile sections"). Name of shared.lib was no
longer expanded after reordering sections.
This commit is contained in:
katjav 2020-03-11 18:39:46 +01:00
parent 3eb4832aaf
commit e6cff665a3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.pdlibbuilder
View file

@ -493,7 +493,7 @@ ifeq ($(system), Linux)
cxx.ldflags := -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags cxx.ldflags := -rdynamic -shared -fPIC -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags
cxx.ldlibs := -lc -lm -lstdc++ cxx.ldlibs := -lc -lm -lstdc++
shared.extension = so shared.extension = so
shared.ldflags := -rdynamic -fPIC -shared -Wl,-soname,$(shared.lib) shared.ldflags = -rdynamic -fPIC -shared -Wl,-soname,$(shared.lib)
endif endif
@ -648,7 +648,7 @@ depcheck.flags := $(cpp.flags) $(cflags)
LDFLAGS := $(arch.ld.flags) LDFLAGS := $(arch.ld.flags)
# now add the same ld flags to shared dynamic lib # now add the same ld flags to shared dynamic lib
shared.ldflags := $(shared.ldflags) $(LDFLAGS) shared.ldflags += $(LDFLAGS)
# accumulated flags for C compiler / linker # accumulated flags for C compiler / linker
c.flags := $(cpp.flags) $(c.flags) $(cflags) $(CFLAGS) c.flags := $(cpp.flags) $(c.flags) $(cflags) $(CFLAGS)