From: Peter Rosin <peda@lysator.liu.se>
Date: Sun, 18 Jul 2010 15:17:15 +0000 (+0200)
Subject: dllimport when the lib is shared and not linking with -static
X-Git-Tag: v2.4~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e01d00c70fe1eba2b746a6bb52e3c9277a4f1ef;p=thirdparty%2Flibtool.git

dllimport when the lib is shared and not linking with -static

* tests/stresstest.at: Link with main.lo when liba is shared
and linking main with -no-install.
---

diff --git a/ChangeLog b/ChangeLog
index 73f74355e..d7aecc4b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-18  Peter Rosin  <peda@lysator.liu.se>
+
+	* tests/stresstest.at: Link with main.lo when liba is shared
+	and linking main with -no-install.
+
 2010-07-18  Peter Rosin  <peda@lysator.liu.se>
 
 	* tests/stresstest.at [MSVC]: dllimport all imported
diff --git a/tests/stresstest.at b/tests/stresstest.at
index 652232960..e71d492d9 100644
--- a/tests/stresstest.at
+++ b/tests/stresstest.at
@@ -264,9 +264,12 @@ do
 	         [0],[ignore],[ignore])
 	for st in '' '-static' '-no-install'
 	do
-          case $st,$l3 in
-          ,-rpath*) mst= ;;
-          *) mst=-static ;;
+	  # if -static is not passed, and the library is shared, then we have
+	  # to use -DLIBA_DLL_IMPORT, thus main.lo (and not main-static.lo).
+	  case $st,$l3 in
+	  -static,*) mst=-static ;;
+	  *,-rpath*) mst= ;;
+	  *) mst=-static ;;
 	  esac
 
 	  LT_AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o "$rel"main$EXEEXT "$rel"main$mst.lo "$rel"sub2/liba.la],