aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index b1381e0d..491aa75d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -162,7 +162,8 @@ XCFLAGS=
162# make HOST_CC="gcc -m32" CROSS=i586-mingw32msvc- TARGET_SYS=Windows 162# make HOST_CC="gcc -m32" CROSS=i586-mingw32msvc- TARGET_SYS=Windows
163# make HOST_CC="gcc -m32" CROSS=powerpc-linux-gnu- 163# make HOST_CC="gcc -m32" CROSS=powerpc-linux-gnu-
164 164
165CCOPTIONS= $(CCDEBUG) $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS) 165ASOPTIONS= $(CCOPT) $(CCWARN) $(XCFLAGS) $(CFLAGS)
166CCOPTIONS= $(CCDEBUG) $(ASOPTIONS)
166LDOPTIONS= $(CCDEBUG) $(LDFLAGS) 167LDOPTIONS= $(CCDEBUG) $(LDFLAGS)
167 168
168HOST_CC= $(CC) 169HOST_CC= $(CC)
@@ -201,6 +202,7 @@ TARGET_XLDFLAGS=
201TARGET_XLIBS= -lm 202TARGET_XLIBS= -lm
202TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS) 203TARGET_TCFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
203TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS) 204TARGET_ACFLAGS= $(CCOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
205TARGET_ASFLAGS= $(ASOPTIONS) $(TARGET_XCFLAGS) $(TARGET_FLAGS) $(TARGET_CFLAGS)
204TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS) 206TARGET_ALDFLAGS= $(LDOPTIONS) $(TARGET_XLDFLAGS) $(TARGET_FLAGS) $(TARGET_LDFLAGS)
205TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS) 207TARGET_ASHLDFLAGS= $(LDOPTIONS) $(TARGET_XSHLDFLAGS) $(TARGET_FLAGS) $(TARGET_SHLDFLAGS)
206TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS) 208TARGET_ALIBS= $(TARGET_XLIBS) $(LIBS) $(TARGET_LIBS)
@@ -645,8 +647,8 @@ lj_folddef.h: $(BUILDVM_T) lj_opt_fold.c
645 647
646%.o: %.S 648%.o: %.S
647 $(E) "ASM $@" 649 $(E) "ASM $@"
648 $(Q)$(TARGET_DYNCC) $(TARGET_ACFLAGS) -c -o $(@:.o=_dyn.o) $< 650 $(Q)$(TARGET_DYNCC) $(TARGET_ASFLAGS) -c -o $(@:.o=_dyn.o) $<
649 $(Q)$(TARGET_CC) $(TARGET_ACFLAGS) -c -o $@ $< 651 $(Q)$(TARGET_CC) $(TARGET_ASFLAGS) -c -o $@ $<
650 652
651$(LUAJIT_O): 653$(LUAJIT_O):
652 $(E) "CC $@" 654 $(E) "CC $@"