Changeset 2799 for trunk/src/kmk/Makefile.kmk

Timestamp:

Sep 19, 2015, 10:36:31 PM (10 years ago)

Author:

bird

Message:

Fixed glob.h inclusion issue causing stack corruption. Fixed alignment issue in the string expansion compiler. More makefile eval 'compiler' work.

File:

• trunk/src/kmk/Makefile.kmk (modified) (6 diffs)

trunk/src/kmk/Makefile.kmk

@@ -55 +55 @@
 TEMPLATE_BIN-KMK_CLEAN.win = $(TEMPLATE_BIN-KMK_DEPS.win)
 TEMPLATE_BIN-KMK_INCS = $(kmk_0_OUTDIR) . $(TEMPLATE_BIN-THREADED_INCS)
-TEMPLATE_BIN-KMK_INCS.darwin = glob
-TEMPLATE_BIN-KMK_INCS.dragonfly = glob
-TEMPLATE_BIN-KMK_INCS.freebsd = glob
-TEMPLATE_BIN-KMK_INCS.haiku = glob
-TEMPLATE_BIN-KMK_INCS.openbsd = glob
-TEMPLATE_BIN-KMK_INCS.solaris = glob
+ifneq ($(KBUILD_TARGET),os2)
+ TEMPLATE_BIN-KMK_INCS += glob
+endif
 TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
 ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
@@ -68 +65 @@
  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) -include $(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
 endif
+endif
+# GCC sanitizers.
+ifdef GCC_SANITIZERS
+ TEMPLATE_BIN-KMK_CFLAGS  ?= $(TEMPLATE_BIN-THREADED_CFLAGS)
+ TEMPLATE_BIN-KMK_CFLAGS  += -fsanitize=address -fsanitize=undefined -static-libubsan -D GCC_ADDRESS_SANITIZER
+ TEMPLATE_BIN-KMK_LDFLAGS ?= $(TEMPLATE_BIN-THREADED_LDFLAGS)
+ TEMPLATE_BIN-KMK_LDFLAGS += -fsanitize=address -fsanitize=undefined
 endif
 
@@ -89 +93 @@
         getopt1.c \
         electric.c
+ifneq ($(KBUILD_TARGET),os2)
+kmkmissing_SOURCES += \
+        glob/glob.c
+endif
 
 kmkmissing_SOURCES.darwin = \
         kmkbuiltin/darwin.c \
-        glob/glob.c \
         glob/fnmatch.c
 
 kmkmissing_SOURCES.dragonfly = \
-        glob/glob.c \
         glob/fnmatch.c
 
 kmkmissing_SOURCES.freebsd = \
-        glob/glob.c \
         glob/fnmatch.c
 
 kmkmissing_SOURCES.haiku = \
         kmkbuiltin/haikufakes.c \
-        glob/glob.c \
         glob/fnmatch.c
 
@@ -112 +116 @@
 
 kmkmissing_SOURCES.openbsd = \
-        kmkbuiltin/openbsd.c \
-        glob/glob.c
+        kmkbuiltin/openbsd.c
 
 kmkmissing_SOURCES.solaris = \
         kmkbuiltin/strlcpy.c \
         kmkbuiltin/solfakes.c \
-        glob/glob.c \
         glob/fnmatch.c
 
@@ -124 +126 @@
         kmkbuiltin/strlcpy.c \
         kmkbuiltin/mscfakes.c \
-        glob/glob.c \
         glob/fnmatch.c \
         getloadavg.c \
@@ -205 +206 @@
  kmk_DEFS += CONFIG_WITH_MAKE_STATS
 endif
+ifdef CONFIG_WITH_EVAL_COMPILER
+ kmk_DEFS += CONFIG_WITH_EVAL_COMPILER
+endif
+ifdef CONFIG_WITH_COMPILER
+ kmk_DEFS += CONFIG_WITH_COMPILE_EVERYTHING
+endif
 
 kmk_SOURCES = \