diff --git a/etc/bashrc b/etc/bashrc index 2e157923b74d9ed6d5b3c421fcdb6abf7fb2dcbc..e4cb5fb72d35664b1d40b1b16f7fa0a77c85b2d0 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -91,6 +91,7 @@ export WM_COMPILE_OPTION=Opt # +openmp : with openmp # ~openmp : without openmp # +ccache : use ccache +# +xcrun : use xcrun and native compilers [MacOS] # ccache=... : ccache command (unquoted, single/double or <> quoted) # version=... : compiler suffix (eg, "11" for gcc-11) #export WM_COMPILE_CONTROL="+gold" diff --git a/etc/cshrc b/etc/cshrc index 5a42602f5052620da9742c5c81dc511d1df88b97..19f5849746061483cc3222a8e7c2ef7e8a5bd37f 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -91,6 +91,7 @@ setenv WM_COMPILE_OPTION Opt # +openmp : with openmp # ~openmp : without openmp # +ccache : use ccache +# +xcrun : use xcrun and native compilers [MacOS] # ccache=... : ccache command (unquoted, single/double or <> quoted) # version=... : compiler suffix (eg, "11" for gcc-11) #setenv WM_COMPILE_CONTROL "+gold" diff --git a/wmake/rules/darwin64Clang/c b/wmake/rules/darwin64Clang/c index d145bd5b927e32bfec6c48a0cff57d6bd9c4df21..3083b281ede351d108c8f815f1925fa958dfe1b9 100644 --- a/wmake/rules/darwin64Clang/c +++ b/wmake/rules/darwin64Clang/c @@ -1,6 +1,10 @@ #------------------------------------------------------------------------------ include $(GENERAL_RULES)/Clang/c +ifneq (,$(findstring +xcrun,$(WM_COMPILE_CONTROL))) +cc := xcrun cc +endif + cARCH := -m64 -ftrapping-math ifneq (,$(strip $(WM_COMPILE_OPTION))) diff --git a/wmake/rules/darwin64Clang/c++ b/wmake/rules/darwin64Clang/c++ index a9e092144ade06a31759f2ce7b96226fccb681a3..01158bcb0f5abef5ea67290c68d82a6ae867fb99 100644 --- a/wmake/rules/darwin64Clang/c++ +++ b/wmake/rules/darwin64Clang/c++ @@ -1,6 +1,10 @@ #------------------------------------------------------------------------------ include $(GENERAL_RULES)/Clang/c++ +ifneq (,$(findstring +xcrun,$(WM_COMPILE_CONTROL))) +CC := xcrun c++ -std=c++14 +endif + c++ARCH := -m64 -pthread -ftrapping-math ifneq (,$(strip $(WM_COMPILE_OPTION)))