From d296aad2a99f16978031b1561a64927d771f76be Mon Sep 17 00:00:00 2001 From: Tomoyuki Sakurai Date: Sun, 18 Aug 2019 14:30:48 +0900 Subject: [PATCH] build systems: Changes to work on FreeBSD Merges https://github.com/espressif/esp-idf/pull/2029 --- tools/cmake/kconfig.cmake | 7 ++++++- tools/idf.py | 4 ++++ tools/kconfig/lxdialog/check-lxdialog.sh | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake index d1d34234d..66b78e257 100644 --- a/tools/cmake/kconfig.cmake +++ b/tools/cmake/kconfig.cmake @@ -34,6 +34,11 @@ function(__kconfig_init) set(MCONF "\"${WINPTY}\" \"${MCONF}\"") endif() endif() + if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD") + set(MAKE_COMMMAND "gmake") + else() + set(MAKE_COMMMAND "make") + endif() if(NOT MCONF) # Use the existing Makefile to build mconf (out of tree) when needed @@ -49,7 +54,7 @@ function(__kconfig_init) CONFIGURE_COMMAND "" BINARY_DIR "kconfig_bin" BUILD_COMMAND rm -f ${src_path}/zconf.lex.c ${src_path}/zconf.hash.c - COMMAND make -f ${src_path}/Makefile mconf-idf + COMMAND ${MAKE_COMMMAND} -f ${src_path}/Makefile mconf-idf BUILD_BYPRODUCTS ${MCONF} INSTALL_COMMAND "" EXCLUDE_FROM_ALL 1 diff --git a/tools/idf.py b/tools/idf.py index 1083d1d02..8f1a71103 100755 --- a/tools/idf.py +++ b/tools/idf.py @@ -36,6 +36,7 @@ import re import shutil import subprocess import sys +import platform class FatalError(RuntimeError): @@ -64,6 +65,9 @@ if "MSYSTEM" in os.environ: # MSYS elif os.name == "nt": # other Windows MAKE_CMD = "mingw32-make" MAKE_GENERATOR = "MinGW Makefiles" +elif platform.system() == "FreeBSD": + MAKE_CMD = "gmake" + MAKE_GENERATOR = "Unix Makefiles" else: MAKE_CMD = "make" MAKE_GENERATOR = "Unix Makefiles" diff --git a/tools/kconfig/lxdialog/check-lxdialog.sh b/tools/kconfig/lxdialog/check-lxdialog.sh index e9daa6270..de48a1c26 100755 --- a/tools/kconfig/lxdialog/check-lxdialog.sh +++ b/tools/kconfig/lxdialog/check-lxdialog.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Check ncurses compatibility # What library to link