Skip to content

C
core
Kaydet (Commit) 0dca6e89 authored tarafından Philipp Lohmann [pl]'s avatar Philipp Lohmann [pl]
Dosyalara gözat
Seçenekler

d2v02: #161005# use X11 link dependency only where really required

üst 3ea95386
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
solenv/inc/unxlng.mk
Dosyayı görüntüle @ 0dca6e89
...@@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort ...@@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort
.ENDIF .ENDIF
# libraries for linking applications # libraries for linking applications
STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
# libraries for linking shared libraries # libraries for linking shared libraries
STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
.IF "$(USE_STLP_DEBUG)" != "" .IF "$(USE_STLP_DEBUG)" != ""
......
solenv/inc/unxsoli4.mk
Dosyayı görüntüle @ 0dca6e89
...@@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc ...@@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
# libdl.so - no really an GUI library but required in this context # libdl.so - no really an GUI library but required in this context
STDLIBGUIMT+=-ldl STDLIBGUIMT+=-ldl
STDSHLGUIMT+=-ldl STDSHLGUIMT+=-ldl
X11LINK_DYNAMIC = -lX11 X11LINK_DYNAMIC = -lXext -lX11
# @@@ interposer needed for -Bdirect @@@ # @@@ interposer needed for -Bdirect @@@
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
......
solenv/inc/unxsols4.mk
Dosyayı görüntüle @ 0dca6e89
...@@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc ...@@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
# libdl.so - no really an GUI library but required in this context # libdl.so - no really an GUI library but required in this context
STDLIBGUIMT+=-ldl STDLIBGUIMT+=-ldl
STDSHLGUIMT+=-ldl STDSHLGUIMT+=-ldl
X11LINK_DYNAMIC = -lX11 X11LINK_DYNAMIC = -lXext -lX11
# @@@ interposer needed for -Bdirect @@@ # @@@ interposer needed for -Bdirect @@@
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment