use isTrue instead of ifdef

Signed-off-by: Jade Abraham <jade.abraham@hpe.com>
chapel-lang · Jan 6, 2025 · 698ee64 · 698ee64
1 parent f652882
commit 698ee64
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/compiler/make/Makefile.compiler.head b/compiler/make/Makefile.compiler.head
@@ -34,7 +34,7 @@ ifeq ($(ASSERTS),1)
   DYNO_ENABLE_ASSERTIONS = 1
 endif
 
-ifeq ($(CHPL_DEVELOPER), 0)
+ifneq (, $(call isTrue, $(CHPL_DEVELOPER)))
 OPTIMIZE=1
 else
 DEBUG=1

diff --git a/make/Makefile.base b/make/Makefile.base
@@ -106,6 +106,9 @@ ifndef CHPL_MAKE_HOST_PLATFORM
   $(error error running util/printchplenv -- please see error above)
 endif
 
+# set CHPL_DEVELOPER if its not set
+CHPL_DEVELOPER ?= 0
+
 # Try this to debug issues with CHPL_MAKE_* variables
 # $(info $(CHPL_MAKE_CHPLENV_CACHE))
 
@@ -138,7 +141,7 @@ CHPL_MAKE_SYSTEM_LINK_ARGS = $(CHPL_MAKE_TARGET_SYSTEM_LINK_ARGS)
 else
 CHPL_MAKE_COMPILER = $(CHPL_MAKE_HOST_COMPILER)
 CHPL_MAKE_CC = $(CHPL_MAKE_HOST_CC)
-CHPL_MAKE_CXX = $(CHPL_MAKE_HOST_CXX)
+CHPL_MAKE_CXX = $(CHPL_MAKE_OST_CXX)
 CHPL_MAKE_PLATFORM = $(CHPL_MAKE_HOST_PLATFORM)
 CHPL_MAKE_ARCH = $(CHPL_MAKE_HOST_ARCH)
 CHPL_MAKE_MEM = $(CHPL_MAKE_HOST_MEM)

diff --git a/modules/Makefile b/modules/Makefile
@@ -21,7 +21,7 @@ export CHPL_MAKE_HOME=$(shell pwd)/..
 endif
 
 # Generate tags only if $TAGS turned on explicitly, or if $CHPL_DEVELOPER is on
-ifdef CHPL_DEVELOPER
+ifeq (, $(call isTrue, $(CHPL_DEVELOPER)))
 TAGS=1
 endif
 

diff --git a/runtime/etc/Makefile.include b/runtime/etc/Makefile.include
@@ -171,7 +171,7 @@ printmultilocalelibdeps:
 
 checkRtLibDir:
 ifeq ($(wildcard $(CHPL_RT_LIB_DIR)),)
-ifdef CHPL_DEVELOPER
+ifeq (, $(call isTrue, $(CHPL_DEVELOPER)))
 	$(warning Expected runtime library in $(CHPL_RT_LIB_DIR))
 endif
 ifeq ($(CHPL_MODULE_HOME),$(CHPL_HOME))

diff --git a/runtime/make/Makefile.runtime.head b/runtime/make/Makefile.runtime.head
@@ -20,7 +20,7 @@
 # settings for the build
 #
 DEPEND=1
-ifdef CHPL_DEVELOPER
+ifeq (, $(call isTrue, $(CHPL_DEVELOPER)))
 DEBUG=1
 WARNINGS=1
 TAGS=1

diff --git a/third-party/Makefile b/third-party/Makefile
@@ -3,7 +3,7 @@ export CHPL_MAKE_HOME=$(shell pwd)/..
 endif
 include $(CHPL_MAKE_HOME)/make/Makefile.base
 
-ifdef CHPL_DEVELOPER
+ifeq (, $(call isTrue, $(CHPL_DEVELOPER)))
 DEBUG=1
 export DEBUG
 WARNINGS=1
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ export CHPL_MAKE_HOME=$(shell pwd)/.. @@
     endif
     # Generate tags only if $TAGS turned on explicitly, or if $CHPL_DEVELOPER is on
-    ifdef CHPL_DEVELOPER
+    ifeq (, $(call isTrue, $(CHPL_DEVELOPER)))
     TAGS=1
     endif
@@ Expand Down @@