mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
[svn-r3804] Purpose:
Bug Fix Description: If we need to specify a -R flag for dynamic libraries (like, in the case when we specify --with-hdf4), then this flag needs to be added to the linking line so that it will show up in the generated library and other programs linking to that library will be able to find the relevant libraries. Solution: Added the DYNAMIC_DIRS macro to the link line. Platforms tested: Arabica
This commit is contained in:
parent
365b06f606
commit
ef461a8454
@ -44,7 +44,7 @@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
|
||||
DYNAMIC_DIRS=@DYNAMIC_DIRS@
|
||||
LT=$(top_builddir)/libtool
|
||||
LT_COMPILE=$(LT) --mode=compile $(CXX)
|
||||
LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir)
|
||||
LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
|
||||
LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -static -rpath $(bindir) $(DYNAMIC_DIRS)
|
||||
LT_RUN=$(LT) --mode=execute
|
||||
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
|
||||
|
@ -46,7 +46,7 @@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
|
||||
DYNAMIC_DIRS=@DYNAMIC_DIRS@
|
||||
LT=$(top_builddir)/libtool
|
||||
LT_COMPILE=$(LT) --mode=compile $(CC)
|
||||
LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir)
|
||||
LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS)
|
||||
LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
|
||||
LT_RUN=$(LT) --mode=execute
|
||||
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
|
||||
|
@ -50,7 +50,7 @@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
|
||||
DYNAMIC_DIRS=@DYNAMIC_DIRS@
|
||||
LT=$(top_builddir)/libtool
|
||||
LT_CCOMPILE=$(LT) --mode=compile $(CC)
|
||||
LT_LINK_CLIB=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -rpath $(libdir)
|
||||
LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir)
|
||||
LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir)
|
||||
LT_RUN=$(LT) --mode=execute
|
||||
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
|
||||
|
Loading…
Reference in New Issue
Block a user