Skip to content
Snippets Groups Projects
Commit d679e46a authored by Mark OLESEN's avatar Mark OLESEN
Browse files

CONFIG: adjust rpath values (#2948)

- drop compile-time paths for FOAM_SITE_LIBBIN and FOAM_LIBBIN as well.
  The handling of 'site' is likely too fragile if anything is relocated.
  The project libraries are covered via @loader_path anyhow.
parent 77675a24
Branches
Tags
No related merge requests found
......@@ -9,22 +9,7 @@ endif
PROJECT_RPATH :=
# No user libraries (FOAM_USER_LIBBIN) - too fragile
# group libraries
ifneq (,$(strip $(FOAM_SITE_LIBBIN)))
PROJECT_RPATH += -rpath $(FOAM_SITE_LIBBIN)
endif
# project libraries - serial and mpi-specific
ifneq (,$(strip $(FOAM_LIBBIN)))
ifneq (dummy,$(strip $(FOAM_MPI)))
PROJECT_RPATH += -rpath $(FOAM_LIBBIN)/$(FOAM_MPI)
endif
PROJECT_RPATH += -rpath $(FOAM_LIBBIN)
endif
# ThirdParty serial and mpi-specific libraries
# ThirdParty libraries (FOAM_EXT_LIBBIN) : mpi-specific and serial
ifneq (,$(strip $(FOAM_EXT_LIBBIN)))
ifneq (dummy,$(strip $(FOAM_MPI)))
PROJECT_RPATH += -rpath $(FOAM_EXT_LIBBIN)/$(FOAM_MPI)
......@@ -32,19 +17,14 @@ ifneq (,$(strip $(FOAM_EXT_LIBBIN)))
PROJECT_RPATH += -rpath $(FOAM_EXT_LIBBIN)
endif
# Largely as above, but with MacOS relative rpath:
# Encode as @loader_path and recompose as @executable_path as needed
# project libraries (FOAM_LIBBIN) : mpi-specific and serial
# encode as @loader_path and recompose as @executable_path as needed
ifneq (dummy,$(strip $(FOAM_MPI)))
PROJECT_RPATH += -rpath @loader_path/$(FOAM_MPI)
endif
PROJECT_RPATH += -rpath @loader_path
# Fallback for stubs libraries (largely for missing MPI) - to be found last
ifneq (,$(strip $(FOAM_LIBBIN)))
PROJECT_RPATH += -rpath $(FOAM_LIBBIN)/dummy
endif
PROJECT_RPATH += -rpath @loader_path/dummy
#------------------------------------------------------------------------------
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