build updates

marbl · Sep 3, 2024 · 5c1d50e · 5c1d50e
1 parent f25e36c
commit 5c1d50e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -127,9 +127,9 @@ define SET_DEFAULT_FLAGS
   else
     TOOLCHAIN  := LLVM
     TOOLCHAINV := $$(shell ${CXX} -dumpversion)
-    CFLAGS     := -pthread -fopenmp -fPIC -std=c17   ${1}
-    CXXFLAGS   := -pthread -fopenmp -fPIC -std=c++20 ${1}
-    LDFLAGS    := -pthread -fopenmp                  ${2} -lm
+    CFLAGS     := -DBOOST_NO_CXX98_FUNCTION_BASE -pthread -fopenmp -fPIC -std=c17   ${1}
+    CXXFLAGS   := -DBOOST_NO_CXX98_FUNCTION_BASE -pthread -fopenmp -fPIC -std=c++20 ${1}
+    LDFLAGS    := -DBOOST_NO_CXX98_FUNCTION_BASE -pthread -fopenmp                  ${2} -lm
   endif
 
   #  Build up our preferred set of flags.

diff --git a/src/Makefile.boilermake b/src/Makefile.boilermake
@@ -160,11 +160,18 @@ endef
 define ADD_FILE_COPY_RULE
   doall: $${TARGET_DIR}/$2
   ifeq ($3,executable)
+  ifeq ($(suffix $(1)),.sh)
   $${TARGET_DIR}/$2: $1
 		@mkdir -p $$(dir $${TARGET_DIR}/$2)
 		cat $1 |sed s/'version=""'/'version="$(VERSION)"'/g > $${TARGET_DIR}/$2
 		chmod +x $${TARGET_DIR}/$2
   else
+  $${TARGET_DIR}/$2: $1
+		@mkdir -p $$(dir $${TARGET_DIR}/$2)
+		cp $1 $${TARGET_DIR}/$2
+		chmod +x $${TARGET_DIR}/$2
+  endif
+  else
   $${TARGET_DIR}/$2: $1
 		@mkdir -p $$(dir $${TARGET_DIR}/$2)
 		cp -pf $1 $${TARGET_DIR}/$2