aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2023-09-09 23:20:57 +0200
committerMike Pall <mike>2023-09-09 23:20:57 +0200
commit566532b8071c82125a65ad1bea0d5784991fa7a2 (patch)
tree208e1a2ba19eebfe13ca73c24d5a10651b7dbf4c /src/Makefile
parent4611e25c0fbe911486cccae4556eb086c0254c5f (diff)
parent4fe200229289c43868442ba344a71f4ff847bfe1 (diff)
downloadluajit-566532b8071c82125a65ad1bea0d5784991fa7a2.tar.gz
luajit-566532b8071c82125a65ad1bea0d5784991fa7a2.tar.bz2
luajit-566532b8071c82125a65ad1bea0d5784991fa7a2.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 79340a96..224d21e7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -233,7 +233,7 @@ TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAG
233TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) 233TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS)
234TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) 234TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS)
235 235
236TARGET_TESTARCH=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM) 236TARGET_TESTARCH:=$(shell $(TARGET_CC) $(TARGET_TCFLAGS) -E lj_arch.h -dM)
237ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH))) 237ifneq (,$(findstring LJ_TARGET_X64 ,$(TARGET_TESTARCH)))
238 TARGET_LJARCH= x64 238 TARGET_LJARCH= x64
239else 239else