From 177e1bfcdfc79b233ad16af9e52d4fffd72a9cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?agentzh=20=28=E7=AB=A0=E4=BA=A6=E6=98=A5=29?=
 <agentzh@gmail.com>
Date: Tue, 26 Jul 2011 12:19:15 +0800
Subject: [PATCH] we do not specify TARGET_STRIP= when CCDEBUG is set to -g
 because it will make gmake crash. sigh.

---
 t/sanity.t     | 58 ++++++++++++++++++++++++++++++++++++++++++++++----
 util/configure |  8 +++----
 2 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/t/sanity.t b/t/sanity.t
index fc97748..5010867 100644
--- a/t/sanity.t
+++ b/t/sanity.t
@@ -978,8 +978,8 @@ platform: linux (linux)
 cp -rp bundle/ build/
 cd build
 cd LuaJIT-2.0.0-beta8
-make TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
-make install TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
+make CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
+make install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
 export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
 export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0'
 cd ..
@@ -1009,11 +1009,61 @@ cd ../..
 .PHONY: all install clean
 
 all:
-	cd build/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
+	cd build/LuaJIT-2.0.0-beta8 && $(MAKE) CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit
 	cd build/nginx-1.0.4 && $(MAKE)
 
 install:
-	cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP= CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
+	cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install CCDEBUG=-g Q= PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
+	cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
+
+clean:
+	rm -rf build
+
+
+
+=== TEST 19: --with-debug & luajit & --with-cc=cl
+--- cmd: ./configure --with-luajit --with-debug --dry-run --with-cc=cl
+--- out
+platform: linux (linux)
+cp -rp bundle/ build/
+cd build
+cd LuaJIT-2.0.0-beta8
+make CCDEBUG=-g Q= HOST_CC=cl PREFIX=/usr/local/openresty/luajit
+make install CCDEBUG=-g Q= HOST_CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
+export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
+export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0'
+cd ..
+cd nginx-1.0.4
+./configure --prefix=/usr/local/openresty/nginx \
+  --with-debug \
+  --with-cc-opt='-O0' \
+  --add-module=../echo-nginx-module-0.37rc1 \
+  --add-module=../xss-nginx-module-0.03rc3 \
+  --add-module=../ngx_devel_kit-0.2.17 \
+  --add-module=../set-misc-nginx-module-0.22rc1 \
+  --add-module=../form-input-nginx-module-0.07rc5 \
+  --add-module=../encrypted-session-nginx-module-0.01 \
+  --add-module=../ngx_lua-0.2.1rc2 \
+  --add-module=../headers-more-nginx-module-0.15 \
+  --add-module=../srcache-nginx-module-0.12 \
+  --add-module=../array-var-nginx-module-0.03rc1 \
+  --add-module=../memc-nginx-module-0.12 \
+  --add-module=../redis2-nginx-module-0.07 \
+  --add-module=../upstream-keepalive-nginx-module-0.3 \
+  --add-module=../auth-request-nginx-module-0.2 \
+  --add-module=../rds-json-nginx-module-0.12rc1 \
+  --with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
+  --with-cc=cl --with-http_ssl_module
+cd ../..
+--- makefile
+.PHONY: all install clean
+
+all:
+	cd build/LuaJIT-2.0.0-beta8 && $(MAKE) CCDEBUG=-g Q= HOST_CC=cl PREFIX=/usr/local/openresty/luajit
+	cd build/nginx-1.0.4 && $(MAKE)
+
+install:
+	cd build/LuaJIT-2.0.0-beta8 && $(MAKE) install CCDEBUG=-g Q= HOST_CC=cl PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
 	cd build/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
 
 clean:
diff --git a/util/configure b/util/configure
index 8209b79..587dd79 100755
--- a/util/configure
+++ b/util/configure
@@ -326,12 +326,12 @@ sub build_resty_opts {
 
         my $extra_opts = ' TARGET_STRIP=';
 
-        if (defined $cc) {
-            $extra_opts .= " HOST_CC=$cc";
+        if ($opts->{debug}) {
+            $extra_opts = ' CCDEBUG=-g Q=';
         }
 
-        if ($opts->{debug}) {
-            $extra_opts .= ' CCDEBUG=-g Q=';
+        if (defined $cc) {
+            $extra_opts .= " HOST_CC=$cc";
         }
 
         shell "make$extra_opts PREFIX=$luajit_prefix", $dry_run;