webapps.help: whoops, fix using

[factor.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 1418f71dcf97325ef7b5957e7c94a5771d676c01..bad078a8859eb2b0265320d2c2b60acd0a948609 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,9 +5,21 @@ ifdef CONFIG
        DEBUG ?= 0
        REPRODUCIBLE ?= 0
 
+       # gmake's default CXX is g++, we prefer c++
+       SHELL_CXX = $(shell printenv CXX)
+       ifeq ($(SHELL_CXX),)
+               CXX=c++
+       else
+               CXX=$(SHELL_CXX)
+       endif
+
+       XCODE_PATH ?= /Applications/Xcode.app
+       MACOSX_32_SDK ?= MacOSX10.11.sdk
+
        include $(CONFIG)
 
-       CFLAGS = -Wall \
+       CFLAGS += -Wall \
+               -Wextra \
                -pedantic \
                -DFACTOR_VERSION="$(VERSION)" \
                -DFACTOR_GIT_LABEL="$(GIT_LABEL)" \
@@ -15,6 +27,13 @@ ifdef CONFIG
 
        CXXFLAGS += -std=c++11
 
+       # SANITIZER=address ./build.sh compile
+       # address,thread,undefined,leak
+       ifdef SANITIZER
+               CFLAGS += -fsanitize=$(SANITIZER)
+               CXXFLAGS += -fsanitize=$(SANITIZER)
+       endif
+
        ifneq ($(DEBUG), 0)
                CFLAGS += -g -DFACTOR_DEBUG
        else
@@ -22,7 +41,7 @@ ifdef CONFIG
        endif
 
        ifneq ($(REPRODUCIBLE), 0)
-               CFLAGS += -DFACTOR_REPRODUCIBLE -Wno-builtin-macro-redefined
+               CFLAGS += -DFACTOR_REPRODUCIBLE
        endif
 
        ENGINE = $(DLL_PREFIX)factor$(DLL_SUFFIX)$(DLL_EXTENSION)
@@ -143,12 +162,13 @@ help:
        @echo "linux-x86-64"
        @echo "linux-ppc-32"
        @echo "linux-ppc-64"
-       @echo "linux-arm"
+       @echo "linux-arm-64"
        @echo "freebsd-x86-32"
        @echo "freebsd-x86-64"
        @echo "macosx-x86-32"
        @echo "macosx-x86-64"
        @echo "macosx-x86-fat"
+       @echo "macosx-arm64"
        @echo "windows-x86-32"
        @echo "windows-x86-64"
        @echo ""
@@ -176,6 +196,15 @@ macosx-x86-64:
 macosx-x86-fat:
        $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat
 
+macosx-arm64:
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm64
+
+linux-arm-32:
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.32
+
+linux-arm-64:
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.64
+
 linux-x86-32:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.x86.32
 
@@ -188,9 +217,6 @@ linux-ppc-32:
 linux-ppc-64:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.64
 
-linux-arm:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm
-
 windows-x86-32:
        $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.32
        $(MAKE) factor-console CONFIG=vm/Config.windows.x86.32
@@ -205,7 +231,7 @@ macosx.app: factor
        mkdir -p $(BUNDLE)/Contents/MacOS
        mkdir -p $(BUNDLE)/Contents/Frameworks
        mv $(EXECUTABLE) $(BUNDLE)/Contents/MacOS/factor
-       ln -s Factor.app/Contents/MacOS/factor ./factor
+       ln -s $(BUNDLE)/Contents/MacOS/factor ./factor
 
 $(ENGINE): $(DLL_OBJS)
        $(TOOLCHAIN_PREFIX)$(LINKER) $(ENGINE) $(DLL_OBJS)
@@ -258,3 +284,4 @@ clean:
        rm -f Factor.app/Contents/Frameworks/libfactor.dylib
 
 .PHONY: factor factor-lib factor-console factor-ffi-test tags clean macosx.app
+.PHONY: linux-x86-32 linux-x86-64 linux-ppc-32 linux-ppc-64 linux-arm-64 freebsd-x86-32 freebsd-x86-64 macosx-x86-32 macosx-x86-64 macosx-x86-fat macosx-arm64 windows-x86-32 windows-x86-64