You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2014/07/27 15:35:15 UTC

git commit: Account for MinGW case in shared lib flags.

Repository: lucy-charmonizer
Updated Branches:
  refs/heads/more_mingw_fixes 9cc154147 -> d273fe748


Account for MinGW case in shared lib flags.

The combination of POSIX-style flags plus an shlib_ext of "dll" wasn't
handled properly, resulting in an invalid read and random junk in the
Makefile.


Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/d273fe74
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/d273fe74
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/d273fe74

Branch: refs/heads/more_mingw_fixes
Commit: d273fe7488664576f3fdd2ba004bcbd14bc2c0a5
Parents: 9cc1541
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sun Jul 27 14:31:16 2014 +0100
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Sun Jul 27 14:33:41 2014 +0100

----------------------------------------------------------------------
 src/Charmonizer/Core/CFlags.c | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/d273fe74/src/Charmonizer/Core/CFlags.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/CFlags.c b/src/Charmonizer/Core/CFlags.c
index 91a7c68..4c18c6f 100644
--- a/src/Charmonizer/Core/CFlags.c
+++ b/src/Charmonizer/Core/CFlags.c
@@ -204,6 +204,14 @@ chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
         else if (strcmp(shlib_ext, ".so") == 0) {
             string = "-fPIC";
         }
+        else if (strcmp(shlib_ext, ".dll") == 0) {
+            /* MinGW */
+            return;
+        }
+        else {
+            /* unknown */
+            return;
+        }
     }
     else {
         return;