Provide library names and paths in apps/import/Make.defs
This commit is contained in:
parent
60d1c63803
commit
5cd3325f7e
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = errno
|
BIN = errno
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = hello
|
BIN = hello
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN1 = hello++1
|
BIN1 = hello++1
|
||||||
@ -90,8 +88,8 @@ endif
|
|||||||
SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4)
|
SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4)
|
||||||
OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
|
OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
|
||||||
|
|
||||||
LIBSTDC_STUBS_DIR = $(TOPDIR)/libxx
|
LDLIBSTDC_STUBS_DIR = $(TOPDIR)/libxx
|
||||||
LIBSTDC_STUBS_LIB = $(LIBSTDC_STUBS_DIR)/liblibxx.a
|
LDLIBSTDC_STUBS_LIB = $(LDLIBSTDC_STUBS_DIR)/liblibxx.a
|
||||||
|
|
||||||
all: $(BIN1) $(BIN2) $(BIN3) $(BIN4)
|
all: $(BIN1) $(BIN2) $(BIN3) $(BIN4)
|
||||||
|
|
||||||
@ -102,8 +100,8 @@ $(OBJS): %.o: %.cpp
|
|||||||
# This contains libstdc++ stubs to that you can build C++ code
|
# This contains libstdc++ stubs to that you can build C++ code
|
||||||
# without actually having libstdc++
|
# without actually having libstdc++
|
||||||
|
|
||||||
$(LIBSTDC_STUBS_LIB):
|
$(LDLIBSTDC_STUBS_LIB):
|
||||||
$(Q) $(MAKE) -C $(LIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
|
$(Q) $(MAKE) -C $(LDLIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
|
||||||
|
|
||||||
# BIN1 and BIN2 link just like C code because they contain no
|
# BIN1 and BIN2 link just like C code because they contain no
|
||||||
# static constructors. BIN1 is equivalent to a C hello world;
|
# static constructors. BIN1 is equivalent to a C hello world;
|
||||||
@ -112,18 +110,18 @@ $(LIBSTDC_STUBS_LIB):
|
|||||||
|
|
||||||
$(BIN1): $(OBJS1)
|
$(BIN1): $(OBJS1)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
$(BIN2): $(OBJS2)
|
$(BIN2): $(OBJS2)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
# BIN3 is equivalent to BIN2 except that is uses static initializers
|
# BIN3 is equivalent to BIN2 except that is uses static initializers
|
||||||
|
|
||||||
ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
|
ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
|
||||||
$(BIN3): $(OBJS3)
|
$(BIN3): $(OBJS3)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# BIN4 is similar to BIN3 except that it uses the streams code from libstdc++
|
# BIN4 is similar to BIN3 except that it uses the streams code from libstdc++
|
||||||
@ -132,7 +130,7 @@ endif
|
|||||||
#
|
#
|
||||||
#$(BIN4): $(OBJS4)
|
#$(BIN4): $(OBJS4)
|
||||||
# @echo "LD: $<"
|
# @echo "LD: $<"
|
||||||
# $(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
# $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN1))
|
$(call DELFILE, $(BIN1))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = longjmp
|
BIN = longjmp
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = mutex
|
BIN = mutex
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = pthread
|
BIN = pthread
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = signal
|
BIN = signal
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -43,28 +43,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = struct
|
BIN = struct
|
||||||
@ -79,7 +77,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -41,28 +41,26 @@ else
|
|||||||
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
NUTTXLIB = "$(TOPDIR)$(DELIM)lib"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBPATH =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
LDELFFLAGS += -Bstatic
|
LDELFFLAGS += -Bstatic
|
||||||
LIBPATH += -L $(NUTTXLIB)
|
LDLIBPATH += -L $(NUTTXLIB)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS =
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y)
|
||||||
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
ifeq ($(CONFIG_BUILD_PROTECTED),y)
|
||||||
LIBS += -luc
|
LDLIBS += -luc
|
||||||
else
|
else
|
||||||
LIBS += -lc
|
LDLIBS += -lc
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y)
|
||||||
LIBS += -lproxies
|
LDLIBS += -lproxies
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BIN = task
|
BIN = task
|
||||||
@ -78,7 +76,7 @@ $(OBJS): %.o: %.c
|
|||||||
|
|
||||||
$(BIN): $(OBJS)
|
$(BIN): $(OBJS)
|
||||||
@echo "LD: $<"
|
@echo "LD: $<"
|
||||||
$(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
|
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $^ $(LDLIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(call DELFILE, $(BIN))
|
$(call DELFILE, $(BIN))
|
||||||
|
@ -149,6 +149,7 @@ endef
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# Tool related definitions
|
# Tool related definitions
|
||||||
|
# Compiler
|
||||||
|
|
||||||
ifeq ($(WINTOOL),y)
|
ifeq ($(WINTOOL),y)
|
||||||
# Windows-native toolchains
|
# Windows-native toolchains
|
||||||
@ -166,5 +167,19 @@ CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
|
|||||||
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
|
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
|
||||||
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
|
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
|
||||||
|
|
||||||
|
# C Pre-processor
|
||||||
|
|
||||||
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
|
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
|
||||||
AFLAGS = $(CFLAGS) -D__ASSEMBLY__
|
AFLAGS = $(CFLAGS) -D__ASSEMBLY__
|
||||||
|
|
||||||
|
# Linker
|
||||||
|
|
||||||
|
ifeq ($(WINTOOL),y)
|
||||||
|
# Windows-native toolchains
|
||||||
|
LDLIBPATH = -L "${shell cygpath -w ${APPDIR}}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}"
|
||||||
|
else
|
||||||
|
# Linux/Cygwin-native toolchain
|
||||||
|
LDLIBPATH = -L ${APPDIR} -L $(TOPDIR)$(DELIM)libs
|
||||||
|
endif
|
||||||
|
|
||||||
|
LDLIBS = -lnuttx
|
||||||
|
Loading…
x
Reference in New Issue
Block a user