Merge branch 'master' into v2.1

1 files changed, 11 insertions, 5 deletions

diff --git a/src/host/buildvm_lib.c b/src/host/buildvm_lib.c
index b125ea12..8914251e 100644
--- a/src/host/buildvm_lib.c
+++ b/src/host/buildvm_lib.c
@@ -378,14 +378,20 @@ void emit_lib(BuildCtx *ctx)
       char *p;
       /* Simplistic pre-processor. Only handles top-level #if/#endif. */
       if (buf[0] == '#' && buf[1] == 'i' && buf[2] == 'f') {
-        int ok = 1;
-        if (!strcmp(buf, "#if LJ_52\n"))
+        int ok = 1, len = strlen(buf);
+        if (buf[len-1] == '\n') {
+          buf[len-1] = 0;
+          if (buf[len-2] == '\r') {
+            buf[len-2] = 0;
+          }
+        }
+        if (!strcmp(buf, "#if LJ_52"))
           ok = LJ_52;
-        else if (!strcmp(buf, "#if LJ_HASJIT\n"))
+        else if (!strcmp(buf, "#if LJ_HASJIT"))
           ok = LJ_HASJIT;
-        else if (!strcmp(buf, "#if LJ_HASFFI\n"))
+        else if (!strcmp(buf, "#if LJ_HASFFI"))
           ok = LJ_HASFFI;
-        else if (!strcmp(buf, "#if LJ_HASBUFFER\n"))
+        else if (!strcmp(buf, "#if LJ_HASBUFFER"))
           ok = LJ_HASBUFFER;
         if (!ok) {
           int lvl = 1;