Support Link Time Optimization (off by default)

[factor.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index e69c1781f7169991dc6c6be9b12b7c496ccb72b9..577a38b2a9a325660c32ddfc2770da55462ab603 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,24 +1,32 @@
 ifdef CONFIG
-       VERSION = 0.99
+       VERSION = 0.100
        GIT_LABEL = $(shell echo `git describe --all`-`git rev-parse HEAD`)
        BUNDLE = Factor.app
        DEBUG ?= 0
        REPRODUCIBLE ?= 0
 
+       SHELL_CC = $(shell printenv CC)
+       ifeq ($(SHELL_CC),)
+               CC := $(shell which clang cc 2>/dev/null | head -n 1)
+       else
+               CC = $(SHELL_CC)
+       endif
+
        # gmake's default CXX is g++, we prefer c++
        SHELL_CXX = $(shell printenv CXX)
        ifeq ($(SHELL_CXX),)
-               CXX=c++
+               CXX := $(shell which clang++ c++ 2>/dev/null | head -n 1)
        else
-               CXX=$(SHELL_CXX)
+               CXX = $(SHELL_CXX)
        endif
 
        XCODE_PATH ?= /Applications/Xcode.app
-       MACOSX_SDK ?= MacOSX10.13.sdk
+       MACOSX_32_SDK ?= MacOSX10.11.sdk
 
        include $(CONFIG)
 
        CFLAGS += -Wall \
+               -Wextra \
                -pedantic \
                -DFACTOR_VERSION="$(VERSION)" \
                -DFACTOR_GIT_LABEL="$(GIT_LABEL)" \
@@ -26,10 +34,18 @@ 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
                CFLAGS += -O3
+               CFLAGS += $(CC_OPT)
        endif
 
        ifneq ($(REPRODUCIBLE), 0)
@@ -154,12 +170,14 @@ help:
        @echo "linux-x86-64"
        @echo "linux-ppc-32"
        @echo "linux-ppc-64"
-       @echo "linux-arm"
+       @echo "linux-arm-32"
+       @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-arm-64"
        @echo "windows-x86-32"
        @echo "windows-x86-64"
        @echo ""
@@ -168,6 +186,7 @@ help:
        @echo "DEBUG=1  compile VM with debugging information"
        @echo "REPRODUCIBLE=1  compile VM without timestamp"
        @echo "SITE_CFLAGS=...  additional optimization flags"
+       @echo "LTO=1  compile VM with Link Time Optimization"
        @echo "X11=1  force link with X11 libraries instead of Cocoa (only on Mac OS X)"
 
 ALL = factor factor-ffi-test factor-lib
@@ -187,6 +206,15 @@ macosx-x86-64:
 macosx-x86-fat:
        $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.x86.fat
 
+macosx-arm-64:
+       $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm.64
+
+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
 
@@ -199,9 +227,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
@@ -216,7 +241,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)
@@ -237,7 +262,7 @@ $(FFI_TEST_LIBRARY): vm/ffi_test.o
        $(TOOLCHAIN_PREFIX)$(CC) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o $(FFI_TEST_LIBRARY) $(TEST_OBJS)
 
 vm/resources.o:
-       $(TOOLCHAIN_PREFIX)$(WINDRES) vm/factor.rs vm/resources.o
+       $(TOOLCHAIN_PREFIX)$(WINDRES) --preprocessor=cat vm/factor.rs vm/resources.o
 
 vm/ffi_test.o: vm/ffi_test.c
        $(TOOLCHAIN_PREFIX)$(CC) -c $(CFLAGS) $(FFI_TEST_CFLAGS) -std=c99 -o $@ $<
@@ -261,6 +286,7 @@ endif
 clean:
        rm -f vm/*.gch
        rm -f vm/*.o
+       rm -f factor
        rm -f factor.dll
        rm -f factor.lib
        rm -f factor.dll.lib
@@ -268,4 +294,5 @@ clean:
        rm -f libfactor-ffi-test.*
        rm -f Factor.app/Contents/Frameworks/libfactor.dylib
 
-.PHONY: factor factor-lib factor-console factor-ffi-test tags clean macosx.app
+.PHONY: factor factor-lib factor-console factor-ffi-test tags clean help 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