diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
| commit | f7d54f00980bc40fc9c445ba601f804fd54a30c7 (patch) | |
| tree | d5b20e51511cb6b01de2049b6f9582c58ebdd917 /solenv/inc/unx.mk | |
| parent | 012ae745c7b48da692943f17343aec604b55cbbb (diff) | |
CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
Diffstat (limited to 'solenv/inc/unx.mk')
| -rw-r--r-- | solenv/inc/unx.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 40446be39e25..616284b855d9 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -233,3 +233,18 @@ KDE_LIBS:=-lkdeui -lkdecore -lqt-mt SOLARLIB+=-L$(KDE_ROOT)$/lib .ENDIF # "$(KDE_ROOT)"!="" .ENDIF # "$(ENABLE_KDE)" != "" + +# Add SOLARLIBDIR to the end of a (potentially previously undefined) +# LD_LIBRARY_PATH (there is no real reason to prefer adding at the end over +# adding at the start); the ": &&" in the bash case enables this to work at the +# start of a recipe line that is not prefixed by "+" as well as in the middle of +# an existing && chain; the tcsh case is somewhat imprecise in that it +# potentially affects multiple commands following on the recipe line: +.IF "$(USE_SHELL)" == "bash" +AUGMENT_LIBRARY_PATH *= : && \ + LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR) +.ELSE +AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \ + eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \ + if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" && +.ENDIF |