diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-03-03 04:55:15 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-03-03 04:55:15 +0000 |
| commit | 1dace48f538d44156cdb71834e718b9ad93d2711 (patch) | |
| tree | 270b2b7ef2babda8ccbf13637aa59a4b9ed2d0d9 | |
| parent | 1c08c0e128e3c672dfbf04ce3bfa1c126c6198da (diff) | |
| download | llvm-1dace48f538d44156cdb71834e718b9ad93d2711.tar.gz llvm-1dace48f538d44156cdb71834e718b9ad93d2711.tar.bz2 llvm-1dace48f538d44156cdb71834e718b9ad93d2711.tar.xz | |
Switch to using -Wl,-R on Solaris.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@65927 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.config.in | 3 | ||||
| -rw-r--r-- | Makefile.rules | 6 | ||||
| -rw-r--r-- | autoconf/configure.ac | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index 6f91bee930..ad49071213 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -200,6 +200,9 @@ LLVMGCC_LANGS := @LLVMGCC_LANGS@ # object files. OBJ_ROOT := . +# What to pass as rpath flag to g++ +RPATH := @RPATH@ + # These are options that can either be enabled here, or can be enabled on the # make command line (ie, make ENABLE_PROFILING=1): diff --git a/Makefile.rules b/Makefile.rules index 21403e0be1..1dc329d046 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -428,7 +428,7 @@ ifdef LOADABLE_MODULE endif ifdef SHARED_LIBRARY - LD.Flags += -Wl,-rpath -Wl,$(LibDir) + LD.Flags += $(RPATH) -Wl,$(LibDir) endif ifdef TOOL_VERBOSE @@ -458,9 +458,9 @@ endif ifneq ($(OS),Darwin) ifdef TOOLNAME ifdef EXAMPLE_TOOL - LD.Flags += -Wl,-rpath -Wl,$(ExmplDir) -export-dynamic + LD.Flags += $(RPATH) -Wl,$(ExmplDir) -export-dynamic else - LD.Flags += -Wl,-rpath -Wl,$(ToolDir) -export-dynamic + LD.Flags += $(RPATH) -Wl,$(ToolDir) -export-dynamic endif endif endif diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 9b852d970f..e58dc66765 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1016,6 +1016,13 @@ fi dnl Determine if the compiler supports -fvisibility-inlines-hidden. AC_CXX_USE_VISIBILITY_INLINES_HIDDEN +dnl Determine linker rpath flag +case $llvm_cv_os_type in + SunOS) RPATH="-Wl,-R" ;; + *) RPATH="-Wl,-rpath" ;; +esac +AC_SUBST(RPATH) + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 10: Specify the output files and generate it |