Browse Source

Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'

* commit 'ad477710244c761ad1c21246c34e0075fee12d11':
  build: Add shorthand for HOSTCC compile macro

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
a6c455cf6b
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      common.mak

+ 2
- 1
common.mak View File

@@ -43,6 +43,7 @@ endef
COMPILE_C = $(call COMPILE,CC) COMPILE_C = $(call COMPILE,CC)
COMPILE_CXX = $(call COMPILE,CXX) COMPILE_CXX = $(call COMPILE,CXX)
COMPILE_S = $(call COMPILE,AS) COMPILE_S = $(call COMPILE,AS)
COMPILE_HOSTC = $(call COMPILE,HOSTCC)


%.o: %.c %.o: %.c
$(COMPILE_C) $(COMPILE_C)
@@ -113,7 +114,7 @@ checkheaders: $(HOBJS)
alltools: $(TOOLS) alltools: $(TOOLS)


$(HOSTOBJS): %.o: %.c $(HOSTOBJS): %.o: %.c
$(call COMPILE,HOSTCC)
$(COMPILE_HOSTC)


$(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTPROGS): %$(HOSTEXESUF): %.o
$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS) $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)


Loading…
Cancel
Save