Skip to content
Snippets Groups Projects
Commit 11715643 authored by deuce's avatar deuce
Browse files

Because the pkt-tool lib args for libglade-2.0 include a -Wl,--rpath that

means the LD_RUN_PATH is ignored, so we need to use -Wl,--rpath too.

This may not work on all platforms... it'd be ld(1) specific.
parent d8c102aa
Branches
Tags
No related merge requests found
...@@ -23,26 +23,20 @@ endif ...@@ -23,26 +23,20 @@ endif
vpath %.c .. vpath %.c ..
# Set up LD_RUN_PATH for run-time locating of the .so files
PWD := $(shell dirname `pwd`)
ifdef SBBSDIR
ifeq ($(os),sunos)
LD_RUN_PATH := $(SBBSDIR)/exec:$(PWD)/$(LIBODIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(SBBSDIR)/exec:$(PWD)/$(LIBODIR)
endif
else
ifeq ($(os),sunos)
LD_RUN_PATH := $(PWD)/$(LIBODIR):/opt/sfw/gcc-3/lib
else
LD_RUN_PATH := $(PWD)/$(LIBODIR)
endif
endif
export LD_RUN_PATH
CFLAGS += $(SBBSDEFS) -I.. $(SMBLIB_CFLAGS) $(XPDEV-MT_CFLAGS) `pkg-config libglade-2.0 --cflags` CFLAGS += $(SBBSDEFS) -I.. $(SMBLIB_CFLAGS) $(XPDEV-MT_CFLAGS) `pkg-config libglade-2.0 --cflags`
# Hopefully, -Wl,-E exports all symbols dynamically everywhere. # Hopefully, -Wl,-E exports all symbols dynamically everywhere.
LDFLAGS += -Wl,-E -L../$(LIBODIR) $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS) `pkg-config libglade-2.0 --libs` LDFLAGS += -Wl,-E -L../$(LIBODIR) `pkg-config libglade-2.0 --libs` $(SMBLIB_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS)
# Because pkg-config for libglade uses --rpath, we need to also, LD_RUN_PATH
# won't work. :-(
ifdef SBBSDIR
LDFLAGS += -Wl,--rpath -Wl,$(SBBSDIR)/exec
endif
PARENT_DIR = $(shell dirname `pwd`)
LDFLAGS += -Wl,--rpath -Wl,$(PARENT_DIR)/$(LIBODIR)
ifeq ($(os),sunos)
LDFLAGS += -Wl,--rpath -Wl,/opt/sfw/gcc-3/lib
endif
$(GTKUSEREDIT): $(OBJS) $(GTKUSEREDIT): $(OBJS)
@echo Linking $@ @echo Linking $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment