diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2012-12-09 15:34:56 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2012-12-09 15:34:56 -0500 |
| commit | 2123fb7820fed27e5c75afe56dc089add4a15b22 (patch) | |
| tree | 8c2ae0753dfae797e71f1356e0ec5d3f3950f4e0 | |
| parent | 2aed03055c7ab88b7c847c2222a2342cd3b1e9f6 (diff) | |
| download | textadept-2123fb7820fed27e5c75afe56dc089add4a15b22.tar.gz textadept-2123fb7820fed27e5c75afe56dc089add4a15b22.zip | |
Remove "-m32" flag when compiling LuaJIT on 32-bit arch; src/Makefile
This also allows for compiling LuaJIT on ARM.
| -rw-r--r-- | src/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index b62ac630..09844a22 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,6 +3,7 @@ kernel = $(shell uname -s) ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) ifeq (win, $(findstring win, $(MAKECMDGOALS))) + # Cross-compile for Win32. ifeq (win32, $(MAKECMDGOALS)) CROSS = i686-w64-mingw32- else ifeq (win64, $(MAKECMDGOALS)) @@ -26,6 +27,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) luadoc = luadoc_start.bat else ifeq (osx, $(findstring osx, $(MAKECMDGOALS))) + # Cross-compile for Mac OSX. CROSS = i686-apple-darwin10- CC = gcc CFLAGS = -m32 -arch i386 -mdynamic-no-pic -mmacosx-version-min=10.5 \ @@ -54,6 +56,7 @@ ifneq (, $(or $(findstring Linux, $(kernel)), $(findstring BSD, $(kernel)))) luadoc = luadoc else + # Build for Linux/BSD. CC = gcc CXX = g++ LUAFLAGS = -DLUA_USE_LINUX @@ -230,7 +233,7 @@ libluajit.a: cd luajit && $(MAKE) CC="$(CC) $(CFLAGS)" cp luajit/src/$@ . libluajit32.a: - cd luajit && $(MAKE) CC="$(CC) -m32 $(CFLAGS)" + cd luajit && $(MAKE) CC="$(CC) $(CFLAGS)" cp luajit/src/libluajit.a $@ lua51.dll: cd luajit && $(MAKE) HOST_CC="$(CC) -m32" CROSS=$(CROSS) TARGET_SYS=Windows |