From 1294b785f91a9f1794d2d5e800c562bbecacc906 Mon Sep 17 00:00:00 2001 From: brocalv Date: Fri, 22 May 2009 10:06:43 +0000 Subject: [PATCH] git-svn-id: http://www.frescor.org/private/svn/frescor/fosa/trunk@1791 35b4ef3e-fd22-0410-ab77-dab3279adceb --- rules.mk | 8 ++++++++ src_partikle/Makefile | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/rules.mk b/rules.mk index 8e22efe..313cac6 100644 --- a/rules.mk +++ b/rules.mk @@ -14,6 +14,14 @@ CFLAGS += -D$(PLATFORM) \ # This prevents mgcc from removing the debug information (stripping) LDFLAGS += -g +# PaRTiKle uses its own compiler script +ifeq ($(PLATFORM), PARTIKLE) + CC = pgcc + LD = ldkernel +endif + + + none: @exec echo -e "\nPlease introduce a target, i.e: 'make test'"; diff --git a/src_partikle/Makefile b/src_partikle/Makefile index a52fce6..d9df2b1 100644 --- a/src_partikle/Makefile +++ b/src_partikle/Makefile @@ -4,17 +4,6 @@ include ../rules.mk FOSA_MODULES=fosa_clocks_and_timers fosa_threads_and_signals fosa_app_def_sched fosa_mutexes_and_condvars fosa_misc fosa_long_jump fosa_time fosa_setjmp fosa_group_clocks FOSA_OBJS=$(addsuffix .o,$(FOSA_MODULES)) -check_gcc = $(shell \ - if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ;\ - then \ - echo "$(1)";\ - else \ - echo "$(2)";\ - fi) - - -CFLAGS += $(call check_gcc, -fno-stack-protector,) - LIBFOSA=libfosa_PARTIKLE.a all: $(LIBFOSA) -- 2.39.2