mirror of
https://gitee.com/openharmony/third_party_mesa3d
synced 2024-11-24 16:00:56 +00:00
gallium/targets: do not link every driver with libllvmpipe.a
Only some targets need that, the others don't.
This commit is contained in:
parent
5fe54df58f
commit
67aba799bc
@ -1885,7 +1885,7 @@ if test "x$enable_gallium_llvm" = xyes; then
|
||||
|
||||
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
|
||||
DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
|
||||
DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
|
||||
MESA_LLVM=1
|
||||
else
|
||||
MESA_LLVM=0
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
|
||||
LDFLAGS += $(LLVM_LDFLAGS)
|
||||
DRIVER_EXTRAS = $(LLVM_LIBS)
|
||||
else
|
||||
|
@ -32,7 +32,6 @@ ifeq ($(MESA_LLVM),1)
|
||||
LD = $(CXX)
|
||||
LDFLAGS += $(LLVM_LDFLAGS)
|
||||
USE_CXX=1
|
||||
DRIVER_PIPES += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
|
||||
DRIVER_LINKS += $(LLVM_LIBS) -lm -ldl
|
||||
endif
|
||||
|
||||
|
@ -22,6 +22,7 @@ DRIVER_DEFINES = \
|
||||
-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
|
||||
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
|
||||
DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
|
||||
endif
|
||||
|
||||
|
@ -22,6 +22,7 @@ DRIVER_DEFINES = \
|
||||
-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
|
||||
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
|
||||
DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
|
||||
endif
|
||||
|
||||
|
@ -14,6 +14,11 @@ PIPE_DRIVERS = \
|
||||
$(TOP)/src/gallium/drivers/trace/libtrace.a \
|
||||
$(TOP)/src/gallium/drivers/rbug/librbug.a
|
||||
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
|
||||
DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
|
||||
endif
|
||||
|
||||
SWRAST_COMMON_GALLIUM_SOURCES = \
|
||||
$(TOP)/src/mesa/drivers/dri/common/utils.c \
|
||||
$(TOP)/src/mesa/drivers/dri/common/drisw_util.c \
|
||||
|
@ -55,6 +55,7 @@ LIBS = \
|
||||
|
||||
# LLVM
|
||||
ifeq ($(MESA_LLVM),1)
|
||||
PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
|
||||
DEFINES += -DGALLIUM_LLVMPIPE
|
||||
GL_LIB_DEPS += $(LLVM_LIBS)
|
||||
LDFLAGS += $(LLVM_LDFLAGS)
|
||||
|
Loading…
Reference in New Issue
Block a user