From ddf68ca14cc849e4b44aa1538c26af0fe0acb816 Mon Sep 17 00:00:00 2001 From: Cary R Date: Mon, 19 May 2008 16:34:54 -0700 Subject: [PATCH] Don't let -I block -ivl! When -I was added it was blocking -ivl since the string comparison is case insensitive. (cherry picked from commit a412149e2c63e0fb1b162cb033263444a7901ab6) --- driver-vpi/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/driver-vpi/main.c b/driver-vpi/main.c index e8484fbdd..c4b503d4e 100644 --- a/driver-vpi/main.c +++ b/driver-vpi/main.c @@ -336,6 +336,14 @@ static int parse(int argc, char *argv[]) assignn(&gstr.pOUT, argv[idx], strlen(argv[idx])-strlen(dot_o_ext)); } + /* Check for the -mingw option */ + else if (startsWith(mingw_option, argv[idx])) + assignn(&gstr.pMINGW, argv[idx]+sizeof(mingw_option)-1, + strlen(argv[idx])-(sizeof(mingw_option)-1)); + /* Check for the -ivl option */ + else if (startsWith(ivl_option, argv[idx])) + assignn(&gstr.pIVL, argv[idx]+sizeof(ivl_option)-1, + strlen(argv[idx])-(sizeof(ivl_option)-1)); /* Check for the --name option */ else if (startsWith(name_option, argv[idx])) { assignn(&gstr.pOUT, argv[idx]+sizeof(name_option)-1, @@ -356,14 +364,6 @@ static int parse(int argc, char *argv[]) append(&gstr.pDEFS, " "); append(&gstr.pDEFS, argv[idx]); } - /* Check for the -mingw option */ - else if (startsWith(mingw_option, argv[idx])) - assignn(&gstr.pMINGW, argv[idx]+sizeof(mingw_option)-1, - strlen(argv[idx])-(sizeof(mingw_option)-1)); - /* Check for the -ivl option */ - else if (startsWith(ivl_option, argv[idx])) - assignn(&gstr.pIVL, argv[idx]+sizeof(ivl_option)-1, - strlen(argv[idx])-(sizeof(ivl_option)-1)); /* Check for the --cflags option */ else if (stricmp("--cflags", argv[idx]) == 0) { setup_ivl_environment();