diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-04 13:31:34 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-04 13:31:34 -0600 |
| commit | 23d6f51d4032133ed41ae5ccff887242d21a7609 (patch) | |
| tree | 25fe79622978f206de14fa9559399c3925e64581 /nuttx/arch/z16 | |
| parent | b4ddd5c4d15cdb22e036721ff513e93c01b6f619 (diff) | |
| download | px4-nuttx-23d6f51d4032133ed41ae5ccff887242d21a7609.tar.gz px4-nuttx-23d6f51d4032133ed41ae5ccff887242d21a7609.tar.bz2 px4-nuttx-23d6f51d4032133ed41ae5ccff887242d21a7609.zip | |
The 'make export' target needs to bundle up the user C startup file (crt0), not the kernel head object
Diffstat (limited to 'nuttx/arch/z16')
| -rw-r--r-- | nuttx/arch/z16/src/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile index 5c0ef42be..02d9c6eb6 100644 --- a/nuttx/arch/z16/src/Makefile +++ b/nuttx/arch/z16/src/Makefile @@ -1,7 +1,7 @@ ############################################################################ # arch/z16/src/Makefile # -# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -65,6 +65,7 @@ endif HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT)) HEAD_OBJ = $(HEAD_SSRC:.S=$(OBJEXT)) +STARTUP_OBJS ?= $(HEAD_OBJ) SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS) ASRCS = $(SSRCS:.S=$(ASMEXT)) @@ -145,12 +146,12 @@ endif # This is part of the top-level export target -export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) +export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS) ifeq ($(CONFIG_WINDOWS_NATIVE),y) - $(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y) + $(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y) else $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \ - cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ + cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \ else \ echo "$(EXPORT_DIR)/startup does not exist"; \ exit 1; \ |