janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 15:33:55 +01:00
Code Activity

defs.mk: Now defined LD to CLANGPP for COMPILER_SUITE == clang

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-03-04 14:58:28 +00:00
commit f17d634bd4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -245,14 +245,12 @@ WINDRES ?= $(CROSS_TOOL_BIN_PREFIX)windres
BUILD_LDFLAGS += -lws2_32 BUILD_LDFLAGS += -lws2_32
USE_GFILTER ?= false USE_GFILTER ?= false
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
LD = $(GPP)
else else
GCC ?= gcc GCC ?= gcc
GPP ?= g++ GPP ?= g++
CLANG ?= clang CLANG ?= clang
CLANGPP ?= clang++ CLANGPP ?= clang++
STRIP ?= strip STRIP ?= strip
LD = $(GPP)
RANLIB ?= ranlib RANLIB ?= ranlib
AR ?= ar AR ?= ar
endif endif
@ -773,11 +771,13 @@ endif
ifeq "$(COMPILER_SUITE)" "gcc" ifeq "$(COMPILER_SUITE)" "gcc"
CC = $(GCC) CC = $(GCC)
CPP = $(GPP) CPP = $(GPP)
LD = $(GPP)
endif endif
ifeq "$(COMPILER_SUITE)" "clang" ifeq "$(COMPILER_SUITE)" "clang"
CC = $(CLANG) CC = $(CLANG)
CPP = $(CLANGPP) CPP = $(CLANGPP)
LD = $(CLANGPP)
endif endif
PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib PROJECTLIB_LDFLAGS += -L$(TOPDIR)/lib