mirror of
https://github.com/dart-lang/sdk
synced 2024-10-02 23:39:19 +00:00
Update sysroot paths used during Debian package building.
Also, riscv64 now works with Clang. Change-Id: I26ba91994f8769d63ba5af6662b31f5cdd007394 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/354062 Reviewed-by: Jonas Termansen <sortie@google.com> Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
parent
afdb87e2cf
commit
1b37593170
|
@ -12,12 +12,12 @@ endif
|
|||
ifeq (amd64,$(DEB_HOST_ARCH_CPU))
|
||||
BUILD_TYPE += ReleaseX64
|
||||
BUILD_FLAGS += --arch=x64
|
||||
LIBS_DIR := $(CURDIR)/dart/build/linux/debian_stretch_amd64-sysroot/lib/x86_64-linux-gnu
|
||||
LIBS_DIR := $(CURDIR)/dart/buildtools/sysroot/linux/lib/x86_64-linux-gnu
|
||||
else
|
||||
ifeq (i386,$(DEB_HOST_ARCH_CPU))
|
||||
BUILD_TYPE += ReleaseIA32
|
||||
BUILD_FLAGS += --arch=ia32
|
||||
LIBS_DIR := $(CURDIR)/dart/build/linux/debian_stretch_i386-sysroot/lib/i386-linux-gnu
|
||||
LIBS_DIR := $(CURDIR)/dart/buildtools/sysroot/linux/lib/i386-linux-gnu
|
||||
else
|
||||
ifeq (arm,$(DEB_HOST_ARCH_CPU))
|
||||
ifeq ($(DEB_BUILD_ARCH_CPU),$(DEB_HOST_ARCH_CPU))
|
||||
|
@ -26,7 +26,7 @@ else
|
|||
BUILD_TYPE += ReleaseXARM
|
||||
endif
|
||||
BUILD_FLAGS += --arch=arm
|
||||
LIBS_DIR := $(CURDIR)/dart/build/linux/debian_stretch_arm-sysroot/lib/arm-linux-gnueabihf
|
||||
LIBS_DIR := $(CURDIR)/dart/buildtools/sysroot/linux/lib/arm-linux-gnueabihf
|
||||
else
|
||||
ifeq (arm64,$(DEB_HOST_ARCH_CPU))
|
||||
ifeq ($(DEB_BUILD_ARCH_CPU),$(DEB_HOST_ARCH_CPU))
|
||||
|
@ -35,7 +35,7 @@ else
|
|||
BUILD_TYPE += ReleaseXARM64
|
||||
endif
|
||||
BUILD_FLAGS += --arch=arm64
|
||||
LIBS_DIR := $(CURDIR)/dart/build/linux/debian_stretch_arm64-sysroot/lib/aarch64-linux-gnu
|
||||
LIBS_DIR := $(CURDIR)/dart/buildtools/sysroot/linux/lib/aarch64-linux-gnu
|
||||
else
|
||||
ifeq (riscv64,$(DEB_HOST_ARCH_CPU))
|
||||
ifeq ($(DEB_BUILD_ARCH_CPU),$(DEB_HOST_ARCH_CPU))
|
||||
|
@ -43,8 +43,8 @@ BUILD_TYPE += ReleaseRISCV64
|
|||
else
|
||||
BUILD_TYPE += ReleaseXRISCV64
|
||||
endif
|
||||
BUILD_FLAGS += --arch=riscv64 --no-clang --use-mallinfo2
|
||||
LIBS_DIR := /usr/riscv64-linux-gnu/lib
|
||||
BUILD_FLAGS += --arch=riscv64
|
||||
LIBS_DIR := $(CURDIR)/dart/buildtools/sysroot/focal/lib/riscv64-linux-gnu
|
||||
else
|
||||
$(error unsupported target arch '$(DEB_HOST_ARCH_CPU)')
|
||||
endif
|
||||
|
|
Loading…
Reference in a new issue