aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2011-09-27 12:26:38 -0700
committerSam Roberts <vieuxtech@gmail.com>2012-04-11 13:45:59 -0700
commita8b19e5367738f606a051f254858dc09de2a695a (patch)
treec949f32c4f958f54dd8ff8a2a54f779a92a9f4f8
parent1f704cfb89324fd7b7cc6f92ea7fa66c7a46846c (diff)
downloadluasocket-a8b19e5367738f606a051f254858dc09de2a695a.tar.gz
luasocket-a8b19e5367738f606a051f254858dc09de2a695a.tar.bz2
luasocket-a8b19e5367738f606a051f254858dc09de2a695a.zip
OS X CFLAGS definition caused silent failure to build debug version of luasocket.
The luasocket tests require LUASOCKET_DEBUG to be defined at build time, but for OS X if COMPAT was undefined, the command line looked like ... -I -DLUASOCKET_DEBUG ... so that the the macro definition was silently being treated as the argument to -I. Result is the macro was never set, and tests would never run. Fixed by moving -I to the (optional) definition of the location of compat headers.
-rw-r--r--config6
1 files changed, 3 insertions, 3 deletions
diff --git a/config b/config
index bef8d72..d6085ad 100644
--- a/config
+++ b/config
@@ -23,7 +23,7 @@ LUAINC=-I/usr/include/lua5.1
23#------ 23#------
24# Compat-5.1 directory 24# Compat-5.1 directory
25# 25#
26#COMPAT=compat-5.1r5 26#COMPAT=-Icompat-5.1r5
27 27
28#------ 28#------
29# Top of your Lua installation 29# Top of your Lua installation
@@ -47,7 +47,7 @@ INSTALL_EXEC=cp
47# 47#
48#CC=gcc 48#CC=gcc
49#DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN 49#DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
50#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common 50#CFLAGS= $(LUAINC) $(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common
51#LDFLAGS=-bundle -undefined dynamic_lookup 51#LDFLAGS=-bundle -undefined dynamic_lookup
52#LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc 52#LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
53 53
@@ -56,7 +56,7 @@ INSTALL_EXEC=cp
56# for Linux 56# for Linux
57CC=gcc 57CC=gcc
58DEF=-DLUASOCKET_DEBUG 58DEF=-DLUASOCKET_DEBUG
59CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic 59CFLAGS= $(LUAINC) $(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
60LDFLAGS=-O -shared -fpic 60LDFLAGS=-O -shared -fpic
61LD=gcc 61LD=gcc
62 62