mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-31 20:40:09 +01:00
4734bfc02a
Both statically linking libLLVMCore and dynamically linking libLLVM causes
duplicated symbols in gallium_dri.so and it fails to dlopen. We don't
really need to link libLLVMCore, but just need generated headers to be
built first. Dynamically linking to libLLVM instead is enough to do
that. Thanks to Qiang Yu for finding the root cause.
With this change, we can align all versions and just have libLLVM as a
shared lib dependency.
This also requires changes in the M and N versions of LLVM to export the
include paths for libLLVM. AOSP master is okay.
Fixes: 26aee6f4d5 ("Android: rework LLVM build support")
Reported-by: Mauro Rossi <issor.oruam@gmail.com>
Cc: 17.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Signed-off-by: Rob Herring <robh@kernel.org>
75 lines
2.5 KiB
Makefile
75 lines
2.5 KiB
Makefile
# Copyright © 2016 Red Hat.
|
|
# Copyright © 2016 Mauro Rossi <issor.oruam@gmail.com>
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
# copy of this software and associated documentation files (the "Software"),
|
|
# to deal in the Software without restriction, including without limitation
|
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
# and/or sell copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice (including the next
|
|
# paragraph) shall be included in all copies or substantial portions of the
|
|
# Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
# IN THE SOFTWARE.
|
|
|
|
# ---------------------------------------
|
|
# Build libmesa_amd_common
|
|
# ---------------------------------------
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := libmesa_amd_common
|
|
|
|
LOCAL_SRC_FILES := \
|
|
$(AMD_COMMON_FILES) \
|
|
$(AMD_COMPILER_FILES) \
|
|
$(AMD_DEBUG_FILES) \
|
|
$(AMD_NIR_FILES)
|
|
|
|
LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU # instructs LLVM to declare LLVMInitializeAMDGPU* functions
|
|
|
|
# generate sources
|
|
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
|
intermediates := $(call local-generated-sources-dir)
|
|
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES))
|
|
|
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
|
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
|
|
|
|
$(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(MESA_TOP)/src/amd/common/sid.h
|
|
$(transform-generated-source)
|
|
|
|
LOCAL_C_INCLUDES := \
|
|
$(MESA_TOP)/include \
|
|
$(MESA_TOP)/src \
|
|
$(MESA_TOP)/src/amd/common \
|
|
$(MESA_TOP)/src/compiler \
|
|
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
|
|
$(MESA_TOP)/src/gallium/include \
|
|
$(MESA_TOP)/src/gallium/auxiliary \
|
|
$(intermediates)/common
|
|
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
|
$(LOCAL_PATH)/common
|
|
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libdrm_amdgpu
|
|
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libmesa_nir
|
|
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
|
libelf
|
|
|
|
$(call mesa-build-with-llvm)
|
|
|
|
include $(MESA_COMMON_MK)
|
|
include $(BUILD_STATIC_LIBRARY)
|