mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
Makefile: simplify output of the libpath_template
If a platform lacks the support to specify the dynamic library path, there is no suitable value to give to the CC_LD_DYNPATH variable. Allow them to be set to an empty string to signal that they do not need to add the usual -Wl,-rpath, or -R or whatever option followed by a directory name. This way, $(call libpath_template,$(SOMELIBDIR)) would expand to just a single mention of that directory, i.e. -L$(SOMELIBDIR) when CC_LD_DYNPATH is set to an empty string (or a "-L", which would have repeated the same "-L$(SOMELIBDIR)" twice without any ill effect). Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
354dbf7d64
commit
4ee286e8e6
1 changed files with 3 additions and 1 deletions
|
@ -111,6 +111,8 @@ endef
|
||||||
|
|
||||||
## Getting sick of writing -L$(SOMELIBDIR) $(CC_LD_DYNPATH)$(SOMELIBDIR)?
|
## Getting sick of writing -L$(SOMELIBDIR) $(CC_LD_DYNPATH)$(SOMELIBDIR)?
|
||||||
## Write $(call libpath_template,$(SOMELIBDIR)) instead, perhaps?
|
## Write $(call libpath_template,$(SOMELIBDIR)) instead, perhaps?
|
||||||
|
## With CC_LD_DYNPATH set to either an empty string or to "-L", the
|
||||||
|
## the directory is not shown the second time.
|
||||||
define libpath_template
|
define libpath_template
|
||||||
-L$(1) $(CC_LD_DYNPATH)$(1)
|
-L$(1) $(if $(filter-out -L,$(CC_LD_DYNPATH)),$(CC_LD_DYNPATH)$(1))
|
||||||
endef
|
endef
|
||||||
|
|
Loading…
Reference in a new issue