From ed5f1a927395a40597aeb5972bf96f94b2818936 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 7 Jan 2014 18:32:38 +0100 Subject: [PATCH] cross-profiles/*-musl.sh: use a different XBPS_TARGET_ARCH so that pkgs don't conflict with glibc ones. --- common/cross-profiles/armv6hf-musl.sh | 2 +- common/cross-profiles/i686-musl.sh | 2 +- common/cross-profiles/x86_64-musl.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cross-profiles/armv6hf-musl.sh b/common/cross-profiles/armv6hf-musl.sh index e52c30a88cf..2f51fd08597 100644 --- a/common/cross-profiles/armv6hf-musl.sh +++ b/common/cross-profiles/armv6hf-musl.sh @@ -1,6 +1,6 @@ # Cross build profile for ARM EABI5 Hard Float and Musl libc. -XBPS_TARGET_ARCH="armv6l" +XBPS_TARGET_ARCH="armv6l-musl" XBPS_CROSS_TRIPLET="arm-linux-musleabi" XBPS_CFLAGS="-O2 -pipe" XBPS_CXXFLAGS="$XBPS_CFLAGS" diff --git a/common/cross-profiles/i686-musl.sh b/common/cross-profiles/i686-musl.sh index acccd6a334d..e9004a546df 100644 --- a/common/cross-profiles/i686-musl.sh +++ b/common/cross-profiles/i686-musl.sh @@ -1,6 +1,6 @@ # Cross build profile for i686 and Musl libc. -XBPS_TARGET_ARCH="i686" +XBPS_TARGET_ARCH="i686-musl" XBPS_CROSS_TRIPLET="i686-linux-musl" XBPS_CFLAGS="-O2 -pipe" XBPS_CXXFLAGS="$XBPS_CFLAGS" diff --git a/common/cross-profiles/x86_64-musl.sh b/common/cross-profiles/x86_64-musl.sh index 11351a1e57f..7df635af1ff 100644 --- a/common/cross-profiles/x86_64-musl.sh +++ b/common/cross-profiles/x86_64-musl.sh @@ -1,6 +1,6 @@ # Cross build profile for x86_64 and Musl libc. -XBPS_TARGET_ARCH="x86_64" +XBPS_TARGET_ARCH="x86_64-musl" XBPS_CROSS_TRIPLET="x86_64-linux-musl" XBPS_CFLAGS="-O2 -pipe" XBPS_CXXFLAGS="$XBPS_CFLAGS"