소스 검색

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

Mike Frysinger 19 년 전
부모
커밋
ff5243aa1c
1개의 변경된 파일4개의 추가작업 그리고 7개의 파일을 삭제
  1. 4 7
      test/Rules.mak

+ 4 - 7
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