diff options
| author | Mark Salter <msalter@redhat.com> | 2013-01-12 10:25:43 -0500 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2013-01-15 10:59:57 -0700 |
| commit | 4667d6aac3d540783344af86abad80c482db983d (patch) | |
| tree | 74d131922487b50bfbb0f6b07a78df936eab0d5f | |
| parent | 42124fe27027b380c2102695169bca5c44671105 (diff) | |
| download | bootstrap.git.DONOTUSE-4667d6aac3d540783344af86abad80c482db983d.tar.gz bootstrap.git.DONOTUSE-4667d6aac3d540783344af86abad80c482db983d.tar.xz bootstrap.git.DONOTUSE-4667d6aac3d540783344af86abad80c482db983d.zip | |
stage1: rpath hacks no longer needed with newer glibc
Signed-off-by: Mark Salter <msalter@redhat.com>
| -rwxr-xr-x | stage1 | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -744,7 +744,7 @@ fi srpm cloog mcd $BUILDDIR/t-cloog $SRC/cloog-*/configure $TCONFIGARGS --with-ppl - make $J LDADD="-rpath ${ROOTFS}/lib${SUFFIX} -lcloog" + make $J make $J install DESTDIR=${ROOTFS} fix_la cloog ;; @@ -788,7 +788,7 @@ fi RANLIB=${TARGET}-ranlib \ CFLAGS="" \ TLSFLAGS="" \ - all LDFLAGS="-Wl,-rpath -Wl,${ROOTFS}/lib${SUFFIX}" + all ARGS="DESTDIR=${ROOTFS}" if [ "$SUFFIX" = "64" ] then @@ -837,6 +837,7 @@ EOF make $J install DESTDIR=${ROOTFS} test -e ${ROOTFS}/usr/bin/cc && rm ${ROOTFS}/usr/bin/cc ln -s gcc ${ROOTFS}/usr/bin/cc + mkdir -p ${ROOTFS}/usr/share/gdb/auto-load/usr/lib64 ;; make | tar | gzip | diffutils | gawk | which | grep ) @@ -869,7 +870,7 @@ EOF # built sed binary in order to extract the --help output, but # this fails because the sed binary is a cross-tool. touch doc/sed.1 - make $J V=1 CFLAGS="-lselinux -Wl,-rpath -Wl,${ROOTFS}/lib${SUFFIX}" + make $J V=1 make $J install DESTDIR=${ROOTFS} ;; @@ -930,7 +931,7 @@ EOF base=`echo $i | sed 's/\.x//'` touch man/$base.1 done - make $J V=1 CFLAGS="-lselinux -Wl,-rpath -Wl,${ROOTFS}/lib${SUFFIX}" + make $J V=1 make $J install DESTDIR=${ROOTFS} ;; |