Several improvements

lsp-plugins · Sep 20, 2024 · 65603f3 · 65603f3
1 parent 3132772
commit 65603f3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 8 deletions.
diff --git a/include/private/dsp/arch/aarch64/features.h b/include/private/dsp/arch/aarch64/features.h
@@ -26,7 +26,9 @@
 
 #ifdef ARCH_AARCH64
 
-    #ifdef PLATFORM_POSIX
+    #if defined(PLATFORM_MACOSX)
+        // TODO: add another method to detect hardware features
+    #elif defined(PLATFORM_POSIX)
         #include <sys/auxv.h>
     #endif /* PLATFORM_POSIX */
 

diff --git a/make/tools.mk b/make/tools.mk
@@ -27,6 +27,20 @@ ifeq ($(PLATFORM),OpenBSD)
   X_AR_TOOL          := ar
   X_LD_TOOL          := ld
   X_PKG_CONFIG       := pkg-config
+else ifeq($(PLATFORM),BSD)
+  X_CC_TOOL          := clang
+  X_CXX_TOOL         := clang++
+  X_AS_TOOL          := as
+  X_AR_TOOL          := ar
+  X_LD_TOOL          := ld
+  X_PKG_CONFIG       := pkg-config
+else ifeq($(PLATFORM),MacOS)
+  X_CC_TOOL          := clang
+  X_CXX_TOOL         := clang++
+  X_AS_TOOL          := as
+  X_AR_TOOL          := ar
+  X_LD_TOOL          := ld
+  X_PKG_CONFIG       := pkg-config
 else
   X_CC_TOOL          := gcc
   X_CXX_TOOL         := g++
@@ -49,13 +63,23 @@ PHP                ?= $(X_PHP_TOOL)
 PKG_CONFIG         ?= $(X_PKG_CONFIG)
 
 # Define tool variables for host build
-HOST_CC            ?= $(CC)
-HOST_CXX           ?= $(CXX)
-HOST_AS            ?= $(AS)
-HOST_AR            ?= $(AR)
-HOST_LD            ?= $(LD)
-HOST_PHP           ?= $(PHP)
-HOST_PKG_CONFIG    ?= $(PKG_CONFIG)
+ifeq ($(CROSS_COMPILE),1)
+  HOST_CC            ?= $(X_CC_TOOL)
+  HOST_CXX           ?= $(X_CXX_TOOL)
+  HOST_AS            ?= $(X_AS_TOOL)
+  HOST_AR            ?= $(X_AR_TOOL)
+  HOST_LD            ?= $(X_LD_TOOL)
+  HOST_PHP           ?= $(X_PHP_TOOL)
+  HOST_PKG_CONFIG    ?= $(X_PKG_CONFIG)
+else
+  HOST_CC            ?= $(CC)
+  HOST_CXX           ?= $(CXX)
+  HOST_AS            ?= $(AS)
+  HOST_AR            ?= $(AR)
+  HOST_LD            ?= $(LD)
+  HOST_PHP           ?= $(PHP)
+  HOST_PKG_CONFIG    ?= $(PKG_CONFIG)
+endif
 
 # Miscellaneous tools
 GIT                ?= $(X_GIT_TOOL)
@@ -85,6 +109,7 @@ else ifeq ($(PLATFORM),Windows)
 else ifeq ($(PLATFORM),MacOS)
   FLAG_RELRO          =
   FLAG_GC_SECTIONS    =
+  CXXFLAGS_EXT       += -std=c++11
 else ifeq ($(PLATFORM),Haiku)
   EXE_FLAGS_EXT      += -L/system/lib -L/system/develop/lib
   SO_FLAGS_EXT       += -L/system/lib -L/system/develop/lib