From patchwork Mon Nov 17 20:02:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volker Krause X-Patchwork-Id: 411789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 81A3714011D for ; Tue, 18 Nov 2014 07:02:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CBCDA2EF3D; Mon, 17 Nov 2014 20:02:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mfXoz1oVDu7n; Mon, 17 Nov 2014 20:02:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 404E42F61A; Mon, 17 Nov 2014 20:02:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 789D31C288F for ; Mon, 17 Nov 2014 20:02:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75BE391B81 for ; Mon, 17 Nov 2014 20:02:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MZl1szpH-oCa for ; Mon, 17 Nov 2014 20:02:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.kdab.com (mail.kdab.com [176.9.126.58]) by whitealder.osuosl.org (Postfix) with ESMTPS id F06FD91A92 for ; Mon, 17 Nov 2014 20:02:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at kdab.com From: Volker Krause To: buildroot@buildroot.org Date: Mon, 17 Nov 2014 21:02:41 +0100 Message-Id: <1416254561-12691-1-git-send-email-volker.krause@kdab.com> Subject: [Buildroot] [PATCH v3] pkg-cmake.mk: Set CMAKE_SYSTEM_PROCESSOR. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This is rarely needed by packages, but convenient to have when it is. Signed-off-by: Volker Krause Reviewed-by: Bernd Kuhls Reviewed-by: Romain Naour Acked-by: Samuel Martin --- Changes v2 -> v3: - fixed endianess handling for ARM v4-v7 - coding style Changes v1 -> v2: - added missing qstrip - set the correct ARM variant as done in http://patchwork.ozlabs.org/patch/408501/ package/pkg-cmake.mk | 22 ++++++++++++++++++++++ support/misc/toolchainfile.cmake.in | 1 + 2 files changed, 23 insertions(+) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index c8735ef..85fda86 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -180,6 +180,27 @@ host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE # Generation of the CMake toolchain file ################################################################################ +# CMAKE_SYSTEM_PROCESSOR should match uname -m +ifeq ($(BR2_ARM_CPU_ARMV4),y) +ARM_VARIANT = armv4 +else ifeq ($(BR2_ARM_CPU_ARMV5),y) +ARM_VARIANT = armv5 +else ifeq ($(BR2_ARM_CPU_ARMV6),y) +ARM_VARIANT = armv6 +else ifeq ($(BR2_ARM_CPU_ARMV7A),y) +ARM_VARIANT = armv7 +endif + +ifeq ($(BR2_arm),y) +CMAKE_SYSTEM_PROCESSOR = $(ARM_VARIANT)l +else ifeq ($(BR2_armeb),y) +CMAKE_SYSTEM_PROCESSOR = $(ARM_VARIANT)b +endif + +ifndef CMAKE_SYSTEM_PROCESSOR +CMAKE_SYSTEM_PROCESSOR = $(BR2_ARCH) +endif + # In order to allow the toolchain to be relocated, we calculate the HOST_DIR # based on the toolchainfile.cmake file's location: $(HOST_DIR)/usr/share/buildroot # In all the other variables, HOST_DIR will be replaced by RELOCATED_HOST_DIR, @@ -193,5 +214,6 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: -e 's:@@TARGET_LDFLAGS@@:$(call qstrip,$(TARGET_LDFLAGS)):' \ -e 's:@@TARGET_CC_NOCCACHE@@:$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CC_NOCCACHE))):' \ -e 's:@@TARGET_CXX_NOCCACHE@@:$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX_NOCCACHE))):' \ + -e 's:@@CMAKE_SYSTEM_PROCESSOR@@:$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR)):' \ $(TOPDIR)/support/misc/toolchainfile.cmake.in \ > $@ diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 4ca3d35..816af13 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -11,6 +11,7 @@ string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR}) set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS") set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS")