PERFORCE change 222375 for review
Brooks Davis
brooks at FreeBSD.org
Mon Feb 25 23:03:42 UTC 2013
http://p4web.freebsd.org/@@222375?ac=10
Change 222375 by brooks at 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(__<bsd.own.mk>__)
==== //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
More information about the p4-projects
mailing list