* ltmain.in (compile_command): append finalize search path to

compile search path

diff --git a/ChangeLog b/ChangeLog
index 99bea4069e2e7fea65afb47c01e290504b543320..ec2f9718f3195fe3531599ba14539bbdda30abc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-03-07  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * ltmain.in (compile_command): append finalize search path to
+       compile search path
+
        * tests/build-relink.test: new; check shlibpath_overrides_runpath
        * tests/Makefile.am (TESTS): add build-relink.test; remove
        hardcode.test duplicates

diff --git a/ltmain.in b/ltmain.in
index c16be0f0f7e5b05d3d99d608f9aed2ac2a0192a2..ac34cf8d7c11a5f25f49e63a90391f769b889afb 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2178,7 +2178,7 @@ EOF
       eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
       rpath=
       hardcode_libdirs=
-      for libdir in $compile_rpath; do
+      for libdir in $compile_rpath $finalize_rpath; do
        # Skip directories that are in the system search path
        case " $sys_lib_search_path " in
        *" $libdir "*) continue ;;
@@ -2502,8 +2502,8 @@ static const void *lt_preloaded_setup() {
        temp_rpath="$rpath"
       fi
 
-      if test -n "$compile_shlibpath"; then
-       compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+       compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
       fi
       if test -n "$finalize_shlibpath"; then
        finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"