Changeset 1573

Timestamp:

01/31/07 21:32:02 (2 years ago)

Author:

Gregor

Message:

install/gdc-posix/mkinstaller.sh, lib/install-gdc.sh: Removed latent references to libtango.a

Files:

trunk/install/gdc-posix/mkinstaller.sh

r1553	r1573
31	31
32	32	# 1) The core
33		if [ ! -e lib/lib~~tango~~.a ]
	33	if [ ! -e lib/libgphobos.a ]
34	34	then
35	35	cd lib \|\| die 1 "Failed to cd to lib"
…	…
39	39	fi
40	40
41		tar zcf core.tar.gz object.di lib/libgphobos.a ~~lib/libtango.a~~ \
	41	tar zcf core.tar.gz object.di lib/libgphobos.a \
42	42	lib/install-gdc.sh \|\| die 1 "Failed to create core.tar.gz"
43	43

r1448	r1573
69	69	if [ "$INPLACE" = "0" ]
70	70	then
71		rm -rf $GPHOBOS_DIR/libgphobos.a $~~GPHOBOS_DIR/libtango.a $~~PREFIX/include/d/$GDC_VER/object.d
	71	rm -rf $GPHOBOS_DIR/libgphobos.a $PREFIX/include/d/$GDC_VER/object.d
72	72	mv $PREFIX/include/d/$GDC_VER/object.d.phobos $PREFIX/include/d/$GDC_VER/object.d
73	73	mv $GPHOBOS_DIR/libgphobos.a.phobos $GPHOBOS_DIR/libgphobos.a
…	…
78	78
79	79	# Sanity check
80		if [ ! -e libgphobos.a -o \
81		! -e libtango.a ]
	80	if [ ! -e libgphobos.a ]
82	81	then
83	82	die "You must run build-gdc.sh before running install-gdc.sh" 4
…	…
99	98	echo 'Copying files...'
100	99	mkdir -p $PREFIX/include/d/$GDC_VER \|\| die "Failed to create include/d/$GDC_VER (maybe you need root privileges?)" 5
101		cp -pRvf libgphobos.a ~~libtango.a~~ $GPHOBOS_DIR \|\| die "Failed to copy libraries" 7
	100	cp -pRvf libgphobos.a $GPHOBOS_DIR \|\| die "Failed to copy libraries" 7
102	101	mv $PREFIX/include/d/$GDC_VER/object.d $PREFIX/include/d/$GDC_VER/object.d.phobos \|\| die "Failed to move Phobos' object.d" 8
103	102	cp -pRvf ../object.di $PREFIX/include/d/$GDC_VER \|\| die "Failed to copy source" 8
…	…
114	113	cat $GPHOBOS_DIR/libgphobos.spec.phobos \|
115	114	grep '^\*lib:' \|
116		sed 's\|:\|: %{!nostdlib:-lc\| ; s\|\%(.*\|-L'$SPECLIBDIR' '$SPECLIBDIR'/lib~~tango.a '$SPECLIBDIR'/lib~~gphobos.a}\|g' >> $GPHOBOS_DIR/libgphobos.spec
	115	sed 's\|:\|: %{!nostdlib:-lc\| ; s\|\%(.*\|-L'$SPECLIBDIR' '$SPECLIBDIR'/libgphobos.a}\|g' >> $GPHOBOS_DIR/libgphobos.spec
117	116	echo '
118	117	%rename cc1_options orig_options