[uClibc-cvs] svn commit: trunk/uClibc

[vapier at uclibc.org]

Author: vapier
Date: 2005-07-28 22:58:15 -0600 (Thu, 28 Jul 2005)
New Revision: 10956

Log:
export PIEFLAG and the noexecstack AS test so that gcc/as arent executed in every subdir

Modified:
   trunk/uClibc/Rules.mak


Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-07-29 03:44:35 UTC (rev 10955)
+++ trunk/uClibc/Rules.mak	2005-07-29 04:58:15 UTC (rev 10956)
@@ -89,9 +89,11 @@
 endif
 
 # A nifty macro to make testing gcc features easier
-check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+check_gcc=$(shell \
+	if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
 	then echo "$(1)"; else echo "$(2)"; fi)
-check_as=$(shell if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \
+check_as=$(shell \
+	if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \
 	then echo "-Wa,$(1)"; fi)
 
 # Setup some shortcuts so that silent mode is silent like it should be
@@ -223,11 +225,14 @@
 	UCLIBC_LDSO=ld.so.1
 endif
 
+# Keep the check_gcc from being needlessly executed
+ifndef PIEFLAG
 ifneq ($(UCLIBC_BUILD_PIE),y)
-PIEFLAG:=
+export PIEFLAG:=
 else
-PIEFLAG:=$(call check_gcc,$(PIEFLAG_NAME),)
+export PIEFLAG:=$(call check_gcc,$(PIEFLAG_NAME),)
 endif
+endif
 
 # Use '-Os' optimization if available, else use -O2, allow Config to override
 OPTIMIZATION+=$(call check_gcc,-Os,-O2)
@@ -312,10 +317,16 @@
 CFLAGS += -D_DL_FINI_CRT_COMPAT
 endif
 
+# Keep the check_as from being needlessly executed
 ASFLAGS = $(CFLAGS)
+ifndef ASFLAGS_NOEXEC
 ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)
-ASFLAGS += $(call check_as,--noexecstack)
+export ASFLAGS_NOEXEC := $(call check_as,--noexecstack)
+else
+export ASFLAGS_NOEXEC :=
 endif
+endif
+ASFLAGS += $(ASFLAGS_NOEXEC)
 
 LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y)
 LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)