Skip to content
Snippets Groups Projects
Unverified Commit 403384c2 authored by Niclas Finne's avatar Niclas Finne Committed by GitHub
Browse files

Merge pull request #404 from g-oikonomou/contrib/native/aropts 

Tidy-up AROPTS for cpu native
parents 566ebdff 47f72706
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/cpu/native/Makefile.native
+ 1
− 1
View file @ 403384c2
...@@ -20,7 +20,7 @@ CFLAGSNO = -Wall -g -I/usr/local/include $(CFLAGSWERROR) ...@@ -20,7 +20,7 @@ CFLAGSNO = -Wall -g -I/usr/local/include $(CFLAGSWERROR)
CFLAGS += $(CFLAGSNO) CFLAGS += $(CFLAGSNO)
ifeq ($(HOST_OS),Darwin) ifeq ($(HOST_OS),Darwin)
AROPTS = -r AROPTS = -rc
LDFLAGS += -Wl,-flat_namespace,-map,$(CONTIKI_NG_PROJECT_MAP) LDFLAGS += -Wl,-flat_namespace,-map,$(CONTIKI_NG_PROJECT_MAP)
CFLAGS += -DHAVE_SNPRINTF=1 -U__ASSERT_USE_STDERR CFLAGS += -DHAVE_SNPRINTF=1 -U__ASSERT_USE_STDERR
else else
......
arch/platform/native/Makefile.native
+ 0
− 3
View file @ 403384c2
...@@ -2,9 +2,6 @@ ifndef CONTIKI ...@@ -2,9 +2,6 @@ ifndef CONTIKI
$(error CONTIKI not defined! You must specify where CONTIKI resides!) $(error CONTIKI not defined! You must specify where CONTIKI resides!)
endif endif
ifeq ($(HOST_OS),Darwin)
AROPTS = rc
endif
CONTIKI_TARGET_DIRS = . dev CONTIKI_TARGET_DIRS = . dev
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o} CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment