openkylin
/
make-it-quick
mirror of https://gitee.com/openkylin/make-it-quick.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid passing full names when linking LIBRARIES 

While it's OK to link a library by giving its .a name, it doesn't
work well when linking with a .so, since it encodes the full path
of the .so name in the result
This commit is contained in:
Christophe de Dinechin 2018-06-15 09:38:35 +02:00
parent 10c7dcd30d
commit a71249c34d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.gnu.mk
View File

@ -108,28 +108,28 @@ MIQ_LINK= $(LIBTOOL) --silent --mode=link
MAKE_CC= $(MIQ_COMPILE) $(CC) $(MIQ_CFLAGS) -c $< -o $@
MAKE_CXX= $(MIQ_COMPILE) $(CXX) $(MIQ_CXXFLAGS) -c $< -o $@
MAKE_AS= $(MIQ_COMPILE) $(CC) $(MIQ_CFLAGS) -c $< -o $@
MAKE_LIB= $(MIQ_LINK) $(LD) $(MIQ_LDFLAGS) $(MIQ_TOLINK) \
MAKE_LIB= $(MIQ_LINK) $(LD) $(MIQ_LDFLAGS) $(MIQ_LINKARGS) \
-rpath $(PREFIX_DLL) -o $@ \
$(MIQ_LT_VERS_OPT)
MAKE_DLL= $(MAKE_LIB)
INSTALL_DLL= $(LIBTOOL) --silent --mode=install \
$(INSTALL) $(MIQ_DLLNAME) $(PREFIX_DLL)
MAKE_EXE= $(MIQ_LINK) $(LD) $(MIQ_LDFLAGS) $(MIQ_TOLINK) -o $@
MAKE_EXE= $(MIQ_LINK) $(LD) $(MIQ_LDFLAGS) $(MIQ_LINKARGS) -o $@
else
# Non-libtool case: manage manually
CFLAGS_PIC= -fPIC
MAKE_CC= $(CC) $(MIQ_CFLAGS) -c $< -o $@
MAKE_CXX= $(CXX) $(MIQ_CXXFLAGS) -c $< -o $@
MAKE_AS= $(CC) $(MIQ_CFLAGS) -c $< -o $@
MAKE_LIB= $(AR) $@ $(MIQ_TOLINK) && $(RANLIB) $@
MAKE_DLL= $(LD) -shared $(MIQ_LDFLAGS) $(MIQ_TOLINK) \
MAKE_LIB= $(AR) $@ $(MIQ_LINKARGS) && $(RANLIB) $@
MAKE_DLL= $(LD) -shared $(MIQ_LDFLAGS) $(MIQ_LINKARGS) \
-o $(MIQ_DLLNAME) \
-Wl,-rpath -Wl,$(PREFIX_DLL) \
$(MIQ_SONAME_OPT) \
&& (cd $(OUTPUT) $(MIQ_SYMLINKS))
INSTALL_DLL= $(INSTALL) $(MIQ_DLLNAME) $(PREFIX_DLL) \
&& (cd $(PREFIX_DLL) $(MIQ_SYMLINKS))
MAKE_EXE= $(LD) $(MIQ_LDFLAGS) $(MIQ_TOLINK) -o $@
MAKE_EXE= $(LD) $(MIQ_LDFLAGS) $(MIQ_LINKARGS) -o $@
endif
LINK_DIR_OPT= -L

3
rules.mk
View File

@ -146,6 +146,9 @@ MIQ_OBJDLLS= $(MIQ_DLLNAMES:%.dll=$(OUTPUT)$(DLL_PFX)%$(DLL_EXT))
MIQ_LINKLIBS= $(MIQ_LIBNAMES:%.lib=$(LINK_LIB_OPT)%) \
$(MIQ_DLLNAMES:%.dll=$(LINK_DLL_OPT)%)
MIQ_TOLINK= $(MIQ_OBJECTS) $(MIQ_OBJLIBS) $(MIQ_OBJDLLS)
MIQ_LINKARGS= $(MIQ_OBJECTS) \
$(OUTPUT:%=$(LINK_DIR_OPT)%) \
$(MIQ_LINKLIBS)
MIQ_RECURSE= $(MAKE) TARGET=$(TARGET) \
BUILDENV=$(RECURSE_BUILDENV) \
TOP="$(abspath $(TOP))/" \