diff options
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 9 |
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 | ||
178 | CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS) | 178 | CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS) |
179 | LDOPTIONS= $(CCDEBUG) $(LDFLAGS) | 179 | LDOPTIONS= $(CCDEBUG) $(LDFLAGS) |
180 | 180 | ||
181 | TARGET_ARCH= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET)) | ||
182 | |||
183 | HOST_CC= $(CC) | 181 | HOST_CC= $(CC) |
184 | HOST_RM= rm -f | 182 | HOST_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= | |||
214 | TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -U_FORTIFY_SOURCE | 212 | TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -U_FORTIFY_SOURCE |
215 | TARGET_XLDFLAGS= | 213 | TARGET_XLDFLAGS= |
216 | TARGET_XLIBS= -lm | 214 | TARGET_XLIBS= -lm |
215 | TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS) | ||
217 | TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_ARCH) $(TARGET_FLAGS) $(TARGET_CFLAGS) | 216 | TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_ARCH) $(TARGET_FLAGS) $(TARGET_CFLAGS) |
218 | TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS) | 217 | TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS) |
219 | TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) | 218 | TARGET_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 |
224 | endif | 223 | endif |
225 | 224 | ||
226 | TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_ACFLAGS) -E lj_arch.h -dM) | 225 | TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM) |
227 | ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH))) | 226 | ifneq (,$(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 | |||
251 | endif | 250 | endif |
252 | endif | 251 | endif |
253 | 252 | ||
253 | TARGET_ARCH= $(patsubst %,-DLUAJIT_TARGET=LUAJIT_ARCH_%,$(TARGET_CCARCH)) | ||
254 | |||
254 | ifneq (,$(PREFIX)) | 255 | ifneq (,$(PREFIX)) |
255 | ifneq (/usr/local,$(PREFIX)) | 256 | ifneq (/usr/local,$(PREFIX)) |
256 | TARGET_XCFLAGS+= -DLUA_XROOT=\"$(PREFIX)/\" | 257 | TARGET_XCFLAGS+= -DLUA_XROOT=\"$(PREFIX)/\" |