Small cleanup (#37)

* Remove execeutable bit from error text files

* Combine Release and Debug Make options into just Release

* Add note about debug vs release builds in readme

* Change debug builds to use -Og

Author: hensldm

.github/workflows/build.yml

@@ -27,13 +27,13 @@ jobs:
         shell: bash
         if: matrix.os == 'ubuntu-20.04'
         run: |
-          make -j $(nproc) RELEASE=1 DEBUG=0 setup
+          make -j $(nproc) RELEASE=1 setup
 
       - name: Run the build script (Ubuntu)
         shell: bash
         if: matrix.os == 'ubuntu-20.04'
         run: |
-          make -j $(nproc) RELEASE=1 DEBUG=0 VERSION=${{ matrix.ido }}
+          make -j $(nproc) RELEASE=1 VERSION=${{ matrix.ido }}
 
       # MacOS
       - name: Install dependencies (MacOS)
@@ -46,12 +46,12 @@ jobs:
         shell: bash
         if: matrix.os == 'macos-latest'
         run: |
-          make -j $(nproc) RELEASE=1 DEBUG=0 setup
+          make -j $(nproc) RELEASE=1 setup
       - name: Run the build script (MacOS)
         shell: bash
         if: matrix.os == 'macos-latest'
         run: |
-          make -j $(nproc) RELEASE=1 DEBUG=0 VERSION=${{ matrix.ido }} TARGET=universal
+          make -j $(nproc) RELEASE=1 VERSION=${{ matrix.ido }} TARGET=universal
 
       # Windows
       - name: Install dependencies (Windows)
@@ -67,14 +67,14 @@ jobs:
         shell: msys2 {0}
         if: matrix.os == 'windows-latest'
         run: |-
-          make --jobs RELEASE=1 DEBUG=0 setup
+          make --jobs RELEASE=1 setup
 
       - name: Run the build script (Windows)
         shell: cmd
         if: matrix.os == 'windows-latest'
         run: |-
           set MSYSTEM=MSYS
-          msys2 -c 'make --jobs RELEASE=1 DEBUG=0 VERSION=${{ matrix.ido }}'
+          msys2 -c 'make --jobs RELEASE=1 VERSION=${{ matrix.ido }}'
 
       # Archive
       - name: Create release archive

Makefile

@@ -9,10 +9,8 @@
 VERSION ?= 7.1
 # if WERROR is 1, pass -Werror to CC, so warnings would be treated as errors
 WERROR ?= 0
-# if RELEASE is 1 symbols are stripped from the recomped binaries
+# if RELEASE is 1 strip binaries as well as enable optimizations
 RELEASE ?= 0
-# Disables/Enables optimizations to make debugging easier
-DEBUG ?= 1
 # On Mac, set this to `universal` to build universal (x86+ARM) binaries
 TARGET ?= native
 # Set to 1 to build with sanitization enabled
@@ -73,14 +71,11 @@ ifneq ($(WERROR),0)
   WARNINGS += -Werror
 endif
 
-ifeq ($(RELEASE),0)
-  STRIP := @:
-endif
-
-ifeq ($(DEBUG),0)
+ifeq ($(RELEASE),1)
   OPTFLAGS     ?= -Os
 else
-  OPTFLAGS     ?= -O0 -g3
+  OPTFLAGS     ?= -Og -g3
+  STRIP := @:
 endif
 
 ifneq ($(ASAN),0)
@@ -155,7 +150,7 @@ setup:
 clean:
 	$(RM) -r $(BUILD_DIR)
 
-distclean: clean
+distclean:
 	$(RM) -r $(BUILD_BASE)
 	$(MAKE) -C $(RABBITIZER) distclean
 

README.md

@@ -40,6 +40,9 @@ make VERSION=7.1
 
 The build artifacts are located in `build/{7.1|5.3}/out`. Add `-j{thread num}` for multithreaded building.
 
+By default, debug builds are created with less optimizations, debug flags, and unstripped binaries.
+Add `RELEASE=1` to build release builds with optimizations and stripped binaries.
+
 ### Creating Universal ARM/x86_64 macOS Builds
 
 By default, make build script create native binaries on macOS. This was done to minimize the time to build the recompiled suite.