aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index d4f80332..3e5b6dc8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -173,13 +173,11 @@ XCFLAGS=
173# 173#
174# Cross-compilation examples: 174# Cross-compilation examples:
175# make HOST_CC="gcc -m32" CROSS=i586-mingw32msvc- TARGET_SYS=Windows 175# make HOST_CC="gcc -m32" CROSS=i586-mingw32msvc- TARGET_SYS=Windows
176# make HOST_CC="gcc -m32" CROSS=powerpc-e500v2-linux-gnuspe- TARGET=ppcspe 176# make HOST_CC="gcc -m32" CROSS=powerpc-linux-gnu-
177 177
178CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS) 178CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS)
179LDOPTIONS= $(CCDEBUG) $(LDFLAGS) 179LDOPTIONS= $(CCDEBUG) $(LDFLAGS)
180 180
181TARGET_ARCH= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET))
182
183HOST_CC= $(CC) 181HOST_CC= $(CC)
184HOST_RM= rm -f 182HOST_RM= rm -f
185# NOTE: The LuaJIT distribution comes with pre-generated buildvm_*.h files. 183# NOTE: The LuaJIT distribution comes with pre-generated buildvm_*.h files.
@@ -214,6 +212,7 @@ TARGET_DYNXLDOPTS=
214TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -U_FORTIFY_SOURCE 212TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -U_FORTIFY_SOURCE
215TARGET_XLDFLAGS= 213TARGET_XLDFLAGS=
216TARGET_XLIBS= -lm 214TARGET_XLIBS= -lm
215TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
217TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_ARCH) $(TARGET_FLAGS) $(TARGET_CFLAGS) 216TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_ARCH) $(TARGET_FLAGS) $(TARGET_CFLAGS)
218TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS) 217TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS)
219TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) 218TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS)
@@ -223,7 +222,7 @@ ifneq (,$(findstring stack-protector,$(shell $(TARGET_CC) -dumpspecs)))
223 TARGET_XCFLAGS+= -fno-stack-protector 222 TARGET_XCFLAGS+= -fno-stack-protector
224endif 223endif
225 224
226TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_ACFLAGS) -E lj_arch.h -dM) 225TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM)
227ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH))) 226ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH)))
228 TARGET_CCARCH= x64 227 TARGET_CCARCH= x64
229 TARGET_XCFLAGS+= $(CCOPT_X64) 228 TARGET_XCFLAGS+= $(CCOPT_X64)
@@ -251,6 +250,8 @@ endif
251endif 250endif
252endif 251endif
253 252
253TARGET_ARCH= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_CCARCH))
254
254ifneq (,$(PREFIX)) 255ifneq (,$(PREFIX))
255ifneq (/usr/local,$(PREFIX)) 256ifneq (/usr/local,$(PREFIX))
256 TARGET_XCFLAGS+= -DLUA_XROOT=\"$(PREFIX)/\" 257 TARGET_XCFLAGS+= -DLUA_XROOT=\"$(PREFIX)/\"