Added support for current version of "emxomf".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/dllar.sh b/src/os2/dllar.sh
index 66e1e8096e973494ff6591740232806fa072445d..32352cebbd6501a831c47f5031cd55388365ce99 100644 (file)
--- a/src/os2/dllar.sh
+++ b/src/os2/dllar.sh
@@ -405,6 +405,8 @@ for file in $inputFiles ; do
     *!)
         ;;
     *)
+        # we do not want to export weak symbols in general, so we filter
+        # those out using grep.
         doCommand "emxexp -u $file | grep -v weak$ >> $tmpdefFile || true"
         ;;
     esac
@@ -466,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