Fix build error by adding -fno-stack-protector to CFLAGS in usr/LBuild (#63)

[lunaix-os.git] / lunaix-os / usr / makefile

diff --git a/lunaix-os/usr/makefile b/lunaix-os/usr/makefile
index 54f72608929aff5c4a59a52062bcadd861c4d4c6..8fa1c316e75ba6d076e9e4ab4546f594849d4322 100644 (file)
--- a/lunaix-os/usr/makefile
+++ b/lunaix-os/usr/makefile
@@ -1,5 +1,6 @@
 include utils.mkinc
 include toolchain.mkinc
 include utils.mkinc
 include toolchain.mkinc

+

 include lunabuild.mkinc
 
 include $(lbuild_mkinc)
 include lunabuild.mkinc
 
 include $(lbuild_mkinc)


@@ -8,6 +9,9 @@ ifndef ARCH
 $(error ARCH is not set)
 endif
 
 $(error ARCH is not set)
 endif
 

+CFLAGS += $(BUILD_CFLAGS)
+LDFLAGS += $(BUILD_LDFLAGS)
+

 task := all
 
 sys_include := $(CURDIR)/includes
 task := all
 
 sys_include := $(CURDIR)/includes


@@ -17,14 +21,16 @@ libc_files := $(libc_name).a
 libc := $(addprefix $(build_dir)/lib/,$(libc_files))
 
 common_param :=        CC AR INCLUDES BUILD_DIR BUILD_NAME\
 libc := $(addprefix $(build_dir)/lib/,$(libc_files))
 
 common_param :=        CC AR INCLUDES BUILD_DIR BUILD_NAME\

-                               CFLAGS LDFLAGS ARCH LBUILD
+                               CFLAGS LDFLAGS ARCH LBUILD LIBC_INCLUDE

 
 INCLUDES := $(sys_include)
 BUILD_DIR := $(build_dir)
 BUILD_NAME := $(libc_name).a
 
 
 INCLUDES := $(sys_include)
 BUILD_DIR := $(build_dir)
 BUILD_NAME := $(libc_name).a
 

+LIBC_INCLUDE := $(build_dir)/usr/includes
+

 mkapp-list := $(addprefix app-, $(shell cat apps.list))
 mkapp-list := $(addprefix app-, $(shell cat apps.list))

-mkexec-list := $(addprefix $(build_dir)/bin/, $(_LBUILD_SRCS))
+mkexec-list := $(addprefix $(build_dir)/bin/, $(BUILD_SRCS))

 
 uexec_ld := $(CURDIR)/uexec.ld
 
 
 uexec_ld := $(CURDIR)/uexec.ld
 


@@ -35,17 +41,18 @@ $(build_dir)/bin:
 $(build_dir)/lib:
        @mkdir -p $(build_dir)/lib
 
 $(build_dir)/lib:
        @mkdir -p $(build_dir)/lib
 

-$(build_dir)/includes:
-       @mkdir -p $(build_dir)/includes
+$(LIBC_INCLUDE):
+       @mkdir -p $(LIBC_INCLUDE)

 
 # LibC
 export $(common_param)
 
 # LibC
 export $(common_param)

-$(build_dir)/$(libc_name).a: $(build_dir)/bin $(build_dir)/lib $(build_dir)/includes
+$(build_dir)/$(libc_name).a: $(build_dir)/bin \
+                                                        $(build_dir)/lib $(LIBC_INCLUDE)

        $(call status,TASK,$(BUILD_NAME))
        @$(MAKE) $(MKFLAGS) -C libc/ $(task)
 
 $(uexec_ld): $(uexec_ld)x
        $(call status,TASK,$(BUILD_NAME))
        @$(MAKE) $(MKFLAGS) -C libc/ $(task)
 
 $(uexec_ld): $(uexec_ld)x

-       @$(CC) -include $(lbuild_config_h) -x c -P -E $< -o $@
+       @$(CC) $(CFLAGS) -x c -P -E $< -o $@

 
 # Application (with standalone makefile)
 export LD_SCRIPT := $(uexec_ld)
 
 # Application (with standalone makefile)
 export LD_SCRIPT := $(uexec_ld)


@@ -56,7 +63,7 @@ app-%: $(uexec_ld)
        @$(MAKE) $(MKFLAGS) -C $* $(task) BUILD_NAME="$*"
 
 app: task := all
        @$(MAKE) $(MKFLAGS) -C $* $(task) BUILD_NAME="$*"
 
 app: task := all

-app: INCLUDES += $(build_dir)/includes
+app: INCLUDES += $(LIBC_INCLUDE)

 app: $(mkapp-list)
 
 
 app: $(mkapp-list)
 
 


@@ -70,7 +77,7 @@ $(build_dir)/bin/%: exec_%.o $(uexec_ld)
        @$(CC) -T $(uexec_ld) -o $@ $< $(libc) $(LDFLAGS)
 
 exec: task := all
        @$(CC) -T $(uexec_ld) -o $@ $< $(libc) $(LDFLAGS)
 
 exec: task := all

-exec: INCLUDES += $(build_dir)/includes
+exec: INCLUDES += $(LIBC_INCLUDE)

 exec: $(mkexec-list)
 
 
 exec: $(mkexec-list)