Use x86_64-linux-musl-gcc instead of musl-gcc

2013-09-25 13:47:38 +01:00 · 2013-09-25 13:47:38 +01:00 · 3b3b6c4a99
parent 9f0216b59a
commit 3b3b6c4a99
21 changed files with 32 additions and 32 deletions
--- a/cross-scripts/curl
+++ b/cross-scripts/curl
@ -12,9 +12,9 @@ unpack() {

 build() {
 	pushd src/curl-7.32.0
-	CC=musl-gcc ./configure --prefix=$top/cross --with-ssl \
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --with-ssl \
 		--with-random=/dev/urandom --disable-shared || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/cross-scripts/libevent
+++ b/cross-scripts/libevent
@ -12,8 +12,8 @@ unpack() {

 build() {
 	pushd src/libevent-2.0.21-stable
-	CC=musl-gcc ./configure --prefix=$top/cross --disable-shared || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --disable-shared || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/cross-scripts/libsigc++
+++ b/cross-scripts/libsigc++
@ -12,8 +12,8 @@ unpack() {

 build() {
 	pushd src/libsigc++-2.3.1
-	CC=musl-gcc ./configure --prefix=$top/cross --disable-shared --enable-static || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --disable-shared --enable-static || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/cross-scripts/libtorrent
+++ b/cross-scripts/libtorrent
@ -12,8 +12,8 @@ unpack() {

 build() {
 	pushd src/libtorrent-0.13.3
-	CC=musl-gcc ./configure --prefix=$top/cross --disable-shared || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --disable-shared || return 1
+	make CC=x86_64-linux-musl-gcc -j$nprocs || return 1
 	popd
 }

--- a/cross-scripts/ncurses
+++ b/cross-scripts/ncurses
@ -13,11 +13,11 @@ unpack() {
 build() {
 	pushd src/ncurses-5.9
 	cp $top/stuff/ncurses-fallback.c ncurses/fallback.c
-	CC=musl-gcc ./configure --prefix=$top/cross --without-tests \
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --without-tests \
 		--with-normal --enable-sigwinch --disable-nls --without-dlsym \
 		--without-cxx-binding \
 		--with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/cross-scripts/zlib
+++ b/cross-scripts/zlib
@ -12,8 +12,8 @@ unpack() {

 build() {
 	pushd src/zlib-1.2.8
-	CC=musl-gcc ./configure --prefix=$top/cross --static || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --static || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/pkgs/dropbear
+++ b/pkgs/dropbear
@ -12,19 +12,19 @@ unpack() {

 build() {
 	pushd src/dropbear-2013.56
-	CC=musl-gcc ./configure CFLAGS="-I$top/cross/include" \
+	CC=x86_64-linux-musl-gcc ./configure CFLAGS="-I$top/cross/include" \
 		LDFLAGS="-static -L$top/cross/lib" --prefix=$root || return 1
 	for i in UTMP WTMP PUTUTLINE PUTUTXLINE SYSLOG LASTLOG; do
 		echo "#define DISABLE_$i" >> config.h
 	done
-	make CC=musl-gcc SCPPROGRESS=1 PROGRAMS="dropbear dbclient scp dropbearkey" \
+	make CC=x86_64-linux-musl-gcc SCPPROGRESS=1 PROGRAMS="dropbear dbclient scp dropbearkey" \
 		prefix=$root sbindir=$root/bin -j$nprocs STATIC=1 || return 1
 	popd
 }

 install() {
 	pushd src/dropbear-2013.56
-	make CC=musl-gcc SCPPROGRESS=1 PROGRAMS="dropbear dbclient scp dropbearkey" prefix=$root \
+	make CC=x86_64-linux-musl-gcc SCPPROGRESS=1 PROGRAMS="dropbear dbclient scp dropbearkey" prefix=$root \
 		sbindir=$root/bin -j$nprocs install STATIC=1 || return 1
 	pushd $root/bin
 	ln -s dbclient ssh
--- a/pkgs/em
+++ b/pkgs/em
@ -14,7 +14,7 @@ build() {
 	pushd src/em
 	make clean
 	sed -i "s@BINDIR=/usr/bin@BINDIR=${root}/bin@;s@LIBDIR=/usr/lib@LIBDIR=${root}/share/doc/uemacs@" Makefile || return 1
-	make -j$nprocs CC="musl-gcc -I$top/cross/include -I$top/cross/include/ncurses" \
+	make -j$nprocs CC="x86_64-linux-musl-gcc -I$top/cross/include -I$top/cross/include/ncurses" \
 		LDFLAGS="-static -L$top/cross/lib" || return 1
 	popd
 }
--- a/pkgs/gawk
+++ b/pkgs/gawk
@ -12,7 +12,7 @@ unpack() {

 build() {
 	pushd src/gawk-4.1.0
-	CC="musl-gcc -static" ./configure --prefix=$root --disable-nls \
+	CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$root --disable-nls \
 		--libdir=$root/devel/x86_64-linux-musl/lib \
 		--libexecdir=$root/devel/x86_64-linux-musl/libexec || return 1
 	make -j$nprocs || return 1
--- a/pkgs/make
+++ b/pkgs/make
@ -12,8 +12,8 @@ unpack() {

 build() {
 	pushd src/make-3.82
-	CC="musl-gcc -static" ./configure --prefix=$root --disable-nls || return 1
-	make CC="musl-gcc -static" -j$nprocs || return 1
+	CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$root --disable-nls || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/pkgs/man
+++ b/pkgs/man
@ -12,7 +12,7 @@ unpack() {

 build() {
 	pushd src/man
-	musl-gcc -std=gnu99 -o man man.c -static || return 1
+	x86_64-linux-musl-gcc -std=gnu99 -o man man.c -static || return 1
 	popd
 }

--- a/pkgs/mksh
+++ b/pkgs/mksh
@ -12,7 +12,7 @@ unpack() {

 build() {
 	pushd src/mksh
-	CC=musl-gcc LDFLAGS+=-static sh Build.sh || return 1
+	CC=x86_64-linux-musl-gcc LDFLAGS+=-static sh Build.sh || return 1
 	popd
 }

--- a/pkgs/rsync
+++ b/pkgs/rsync
@ -12,8 +12,8 @@ unpack() {

 build() {
 	pushd src/rsync-3.0.9
-	CC=musl-gcc ./configure --prefix=$root LDFLAGS="-static" || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$root LDFLAGS="-static" || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/pkgs/sbase
+++ b/pkgs/sbase
@ -7,7 +7,7 @@ fetch() {
 build() {
 	pushd src/sbase
 	make clean
-	make -j$nprocs CC=musl-gcc LDFLAGS=-static || return 1
+	make -j$nprocs CC=x86_64-linux-musl-gcc LDFLAGS=-static || return 1
 	popd
 }

--- a/pkgs/sdhcp
+++ b/pkgs/sdhcp
@ -13,7 +13,7 @@ unpack() {
 build() {
 	pushd src/sdhcp
 	make clean
-	make CC=musl-gcc LDFLAGS=-static || return 1
+	make CC=x86_64-linux-musl-gcc LDFLAGS=-static || return 1
 	popd
 }

--- a/pkgs/sed
+++ b/pkgs/sed
@ -12,7 +12,7 @@ unpack() {

 build() {
 	pushd src/sed-4.2
-	CC="musl-gcc -static" ./configure --prefix=$root --disable-nls \
+	CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$root --disable-nls \
 		--libdir=$root/devel/x86_64-linux-musl/lib \
 		--libexecdir=$root/devel/x86_64-linux-musl/libexec || return 1
 	make -j$nprocs || return 1
--- a/pkgs/sic
+++ b/pkgs/sic
@ -13,7 +13,7 @@ unpack() {
 build() {
 	pushd src/sic
 	make clean
-	make CC=musl-gcc LDFLAGS=-static || return 1
+	make CC=x86_64-linux-musl-gcc LDFLAGS=-static || return 1
 	popd
 }

--- a/pkgs/smdev
+++ b/pkgs/smdev
@ -7,7 +7,7 @@ fetch() {
 build() {
 	pushd src/smdev
 	make clean
-	make CC=musl-gcc LDFLAGS=-static || return 1
+	make CC=x86_64-linux-musl-gcc LDFLAGS=-static || return 1
 	popd
 }

--- a/pkgs/tmux
+++ b/pkgs/tmux
@ -12,10 +12,10 @@ unpack() {

 build() {
 	pushd src/tmux-1.8
-	CC=musl-gcc ./configure --prefix=$root \
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$root \
 		CFLAGS="-I$top/cross/include -I$top/cross/include/ncurses" \
 		LDFLAGS="-static -L$top/cross/lib" || return 1
-	make CC=musl-gcc -j$nprocs || return 1
+	make -j$nprocs || return 1
 	popd
 }

--- a/pkgs/ubase
+++ b/pkgs/ubase
@ -7,7 +7,7 @@ fetch() {
 build() {
 	pushd src/ubase
 	make clean
-	make -j$nprocs CC=musl-gcc LDFLAGS=-static || return 1
+	make -j$nprocs CC=x86_64-linux-musl-gcc LDFLAGS=-static || return 1
 	popd
 }

--- a/pkgs/wget
+++ b/pkgs/wget
@ -12,7 +12,7 @@ unpack() {

 build() {
 	pushd src/wget-1.14
-	CC="musl-gcc -static" ./configure --prefix=$root --without-ssl \
+	CC="x86_64-linux-musl-gcc -static" ./configure --prefix=$root --without-ssl \
 		--libdir=$root/devel/x86_64-linux-musl/lib \
 		--libexecdir=$root/devel/x86_64-linux-musl/libexec || return 1
 	make -j$nprocs || return 1