Fixes for the DLL build

[wxWidgets.git] / src / os2 / dllar.sh

diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh
index 86e0fe3340ef558a8929a26de7db6ad9ebcfee5b..652c940fd1bb8db20cc15eb5b25393f73a2251d1 100644 (file)
--- a/src/os2/dllar.sh
+++ b/src/os2/dllar.sh
@@ -384,10 +384,8 @@ arcFile2="${outimpFile}.lib"
 #create $dllFile as something matching 8.3 restrictions,
 if [ -z $renameScript ] ; then
     dllFile="$outFile"
-    echo "using outFile as dllFile ($outFile)".
 else
     dllFile=`$renameScript $outimpFile`
-    echo "modified $outimpFile to $dllFile"
 fi
 
 if [ $do_backup -ne 0 ] ; then
@@ -407,7 +405,9 @@ for file in $inputFiles ; do
     *!)
         ;;
     *)
-        doCommand "emxexp -u $file >> $tmpdefFile"
+        # we do not want to export weak symbols in general, so we filter
+        # those out using grep.
+        doCommand "emxexp -u $file >> $tmpdefFile || true"
         ;;
     esac
 done
@@ -416,7 +416,6 @@ done
 rm -f $defFile
 echo "LIBRARY `basnam $dllFile` $library_flags" >> $defFile
 dllFile="${dllFile}.dll"
-echo "dllFile now $dllFile";
 if [ ! -z $description ]; then
     echo "DESCRIPTION  \"${description}\"" >> $defFile
 fi
@@ -469,7 +468,17 @@ if [ $flag_USE_LXLITE -ne 0 ]; then
     fi
     doCommand "lxlite -cs -t: -mrn -mln $add_flags $dllFile"
 fi
-doCommand "emxomf -s -l $arcFile"
+
+#New version of emxomf do no longer want the "-l" flag
+case `emxomf` in
+emxomf\ 0.6*)
+    omflibflag=""
+    ;;
+*)
+    omflibflag=" -l"
+    ;;
+esac
+doCommand "emxomf -s$omflibflag $arcFile"
 
 # Successful exit.
 CleanUp 1