summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-14 05:21:43 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-14 05:21:43 +0000
commitff5243aa1ca0dc2013ced04cf5dfd248a6d4b45e (patch)
treee3809abbcde20d9e0c699973ccbb06669a386a3f
parentb90ca275ff6418cd59116b2bdad3228791cc4dcc (diff)
touchup whitespace, remove STRIPTOOL since we no longer use it, and add -Wl,-rpath to default LDFLAGS to fix shared runtime tests to make sure we load libs from the local build rather than the system or (even worse) glibc
-rw-r--r--test/Rules.mak11
1 files changed, 4 insertions, 7 deletions
diff --git a/test/Rules.mak b/test/Rules.mak
index dc0eecf69..3be58f688 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -51,7 +51,6 @@ export TARGET_ARCH
CROSS = $(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
CC = $(CROSS)gcc
-STRIPTOOL = strip
RM = rm -f
# Select the compiler needed to build binaries for your development system
@@ -83,21 +82,19 @@ HOST_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS)
ifeq ($(DODEBUG),y)
CFLAGS += -g
- HOST_CFLAGS += -g
+ HOST_CFLAGS += -g
LDFLAGS += -g -Wl,-warn-common
- HOST_LDFLAGS = -g -Wl,-warn-common
- STRIPTOOL = true -Since_we_are_debugging
+ HOST_LDFLAGS := -g -Wl,-warn-common
else
LDFLAGS += -s -Wl,-warn-common
- HOST_LDFLAGS = -s -Wl,-warn-common
- STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG)
+ HOST_LDFLAGS := -s -Wl,-warn-common
endif
ifneq ($(strip $(HAVE_SHARED)),y)
LDFLAGS += -static
HOST_LDFLAGS += -static
endif
-LDFLAGS += -B$(top_builddir)lib
+LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib
# Filter output