Makefile builds own CXX flags

fizzed · Oct 27, 2023 · ed2a9a9 · ed2a9a9
1 parent 41a6f43
commit ed2a9a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.blaze/blaze.java b/.blaze/blaze.java
@@ -36,7 +36,7 @@ public void build_natives() throws Exception {
         exec("make").workingDir(targetJcatDir).run();
 
         exec("make").workingDir(targetLibHelloJDir)
-            .env("CXXFLAGS", "-z noexecstack")
+            //.env("CXXFLAGS", "-z noexecstack")
             .run();
 
         new Copy(Contexts.currentContext())

diff --git a/native/libhelloj/Makefile b/native/libhelloj/Makefile
@@ -9,12 +9,14 @@ JAVAC ?= javac
 JAVA ?= java
 SHAREDFILEEXT ?= so
 UNAME_S := $(shell uname -s)
+EXTRA_CXXFLAGS := -z noexecstack
 ifeq ($(UNAME_S),Darwin)
 	SHAREDFILEEXT = dylib
+	EXTRA_CXXFLAGS =
 endif
 
 all:
-	$(CXX) -shared -fPIC -Wall -pedantic -O3 $(CXXFLAGS) -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -I${JAVA_HOME}/include/darwin -I${JAVA_HOME}/include/freebsd -I${JAVA_HOME}/include/openbsd -o libhelloj.$(SHAREDFILEEXT) -lc helloj_HelloLib.cpp
+	$(CXX) -shared -fPIC -Wall -pedantic -O3 $(CXXFLAGS) $(EXTRA_CXXFLAGS) -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -I${JAVA_HOME}/include/darwin -I${JAVA_HOME}/include/freebsd -I${JAVA_HOME}/include/openbsd -o libhelloj.$(SHAREDFILEEXT) -lc helloj_HelloLib.cpp
 
 jniheaders:
 	$(JAVAC) -h . helloj/HelloLib.java