Commit 5cc4cf89 authored by Deucе's avatar Deucе 👌🏾
Browse files

Add a NO_LD_RUN_PATH option to avoid linking in an rpath.

parent 7aec5e0e
Pipeline #1046 passed with stage
in 20 minutes and 34 seconds
......@@ -64,24 +64,26 @@ endif
include sbbsdefs.mk
MT_CFLAGS += $(SBBSDEFS)
# Set up LD_RUN_PATH for run-time locating of the .so files
ifdef SBBSDIR
ifeq ($(os),sunos)
LD_RUN_PATH := $(SBBSDIR)/exec:$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
ifndef NO_LD_RUN_PATH
# Set up LD_RUN_PATH for run-time locating of the .so files
ifdef SBBSDIR
ifeq ($(os),sunos)
LD_RUN_PATH := $(SBBSDIR)/exec:$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(SBBSDIR)/exec:$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR)
endif
else
LD_RUN_PATH := $(SBBSDIR)/exec:$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR)
ifeq ($(os),sunos)
LD_RUN_PATH := $(PWD)/$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(PWD)/$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR)
endif
endif
else
ifeq ($(os),sunos)
LD_RUN_PATH := $(PWD)/$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(PWD)/$(LIBODIR):$(JSLIBDIR):$(NSPRDIR):$(CRYPTLIBDIR)
export LD_RUN_PATH
ifeq ($(CCPRE),clang)
LDFLAGS += -rpath $(LD_RUN_PATH)
endif
endif
export LD_RUN_PATH
ifeq ($(CCPRE),clang)
LDFLAGS += -rpath $(LD_RUN_PATH)
endif
CON_LIBS += -lsbbs -lftpsrvr -lwebsrvr -lmailsrvr -lservices
SHLIBOPTS := -shared
......
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