From owner-p4-projects@FreeBSD.ORG Mon Feb 25 23:03:42 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75BCED2E; Mon, 25 Feb 2013 23:03:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 39AA9D2C for ; Mon, 25 Feb 2013 23:03:42 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1E517DC5 for ; Mon, 25 Feb 2013 23:03:42 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1PN3fWu082652 for ; Mon, 25 Feb 2013 23:03:42 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1PN3fTS082649 for perforce@freebsd.org; Mon, 25 Feb 2013 23:03:41 GMT (envelope-from brooks@freebsd.org) Date: Mon, 25 Feb 2013 23:03:41 GMT Message-Id: <201302252303.r1PN3fTS082649@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 222375 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Feb 2013 23:03:42 -0000 http://p4web.freebsd.org/@@222375?ac=10 Change 222375 by brooks@brooks_zenith on 2013/02/25 23:02:52 Revert the SYSROOT portion of 222356 and make --sysroot=${WORLDTMP} part of CC and friends when cross compiling. This is less invasive and and allows rescue to be built. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#4 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.dep.mk#3 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/boot2/Makefile#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptboot/Makefile#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptzfsboot/Makefile#3 edit .. //depot/projects/ctsrd/tesla/src/sys/boot/i386/zfsboot/Makefile#3 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#4 (text+ko) ==== @@ -293,9 +293,10 @@ WMAKE_COMPILER_TYPE= clang .endif .if ${XCC:M/*} -WMAKEENV+= SYSROOT=${WORLDTMP} +XFLAGS= --sysroot=${WORLDTMP} .endif -WMAKEENV+= CC=${XCC} CXX=${XCXX} CPP=${XCPP} \ +WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ + CPP="${XCPP} ${XFLAGS}" \ COMPILER_TYPE=${WMAKE_COMPILER_TYPE} WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.dep.mk#3 (text+ko) ==== @@ -129,10 +129,9 @@ # Different types of sources are compiled with slightly different flags. # Split up the sources, and filter out headers and non-applicable flags. MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*} ${CFLAGS:M-std=*} \ - ${CFLAGS:M-ansi} ${CFLAGS:M--sysroot*} + ${CFLAGS:M-ansi} MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} \ - ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} \ - ${CXXFLAGS:M--sysroot*} + ${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} DPSRCS+= ${SRCS} ${DEPENDFILE}: ${DPSRCS} ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#3 (text+ko) ==== @@ -646,9 +646,4 @@ .endif # !_WITHOUT_SRCCONF -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -LDFLAGS+= --sysroot=${SYSROOT} -.endif - .endif # !target(____) ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -42,10 +42,6 @@ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 \ ${CLANG_OPT_SMALL} -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptboot/Makefile#3 (text+ko) ==== @@ -35,10 +35,6 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/gptzfsboot/Makefile#3 (text+ko) ==== @@ -33,10 +33,6 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections ==== //depot/projects/ctsrd/tesla/src/sys/boot/i386/zfsboot/Makefile#3 (text+ko) ==== @@ -30,10 +30,6 @@ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Winline --param max-inline-insns-single=100 -.if defined(SYSROOT) -CFLAGS+= --sysroot=${SYSROOT} -.endif - LDFLAGS=-static -N --gc-sections