summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-12-07 22:08:39 (EST)
committer P. J. McDermott <pjm@nac.net>2013-12-07 22:14:52 (EST)
commit73b4ed5b52fb830fc5a79a9ece6d1a72bf7b1ca2 (patch)
tree476c76f235f6e996eb43294bc0d70fd72c88bc1e
parentb56f8bbbb6a0e3ccd7d0e2d2319c7f4e4050b7b7 (diff)
build: Set MULTIOSDIR to ".".
This was causing errors due to an unquoted argument to the test utility: Checking multilib configuration for libgcc... /bin/bash: line 0: test: !=: unary operator expected make[5]: Entering directory `/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc/x86_64-unknown-linux-gnu/libgcc' # If this is the top-level multilib, build all the other # multilibs. /root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc/./gcc/xgcc -B/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc/./gcc/ -B/usr/x86_64-unknown-linux-gnu/bin/ -B/usr/x86_64-unknown-linux-gnu/lib/ -isystem /usr/x86_64-unknown-linux-gnu/include -isystem /usr/x86_64-unknown-linux-gnu/sys-include -g -O2 -O2 -g -O2 -DIN_GCC -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition -isystem ./include -fpic -g -DIN_LIBGCC2 -fbuilding-libgcc -fno-stack-protector -fpic -I. -I. -I../.././gcc -I/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc -I/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/. -I/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/../gcc -I/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/../include -I/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/config/libbid -DENABLE_DECIMAL_BID_FORMAT -DHAVE_CC_TLS -DUSE_TLS -o _muldi3.o -MT _muldi3.o -MD -MP -MF _muldi3.dep -DL_muldi3 -c /root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/libgcc2.c -fvisibility=hidden -DHIDE_EXPORTS In file included from /usr/include/features.h:341:0, from /usr/include/stdio.h:27, from /root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/../gcc/tsystem.h:88, from /root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/src/libgcc/libgcc2.c:29: /usr/include/stdc-predef.h:30:26: fatal error: bits/predefs.h: No such file or directory compilation terminated. make[5]: *** [_muldi3.o] Error 1 make[5]: Leaving directory `/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc/x86_64-unknown-linux-gnu/libgcc' make[4]: *** [all-stage1-target-libgcc] Error 2 make[4]: Leaving directory `/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc' make[3]: *** [stage1-bubble] Error 2 make[3]: Leaving directory `/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc' make[2]: *** [bootstrap-lean] Error 2 make[2]: Leaving directory `/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp/obj-core-linux-eglibc' make[1]: *** [buildnative-core-linux-eglibc] Error 2 make[1]: Leaving directory `/root/ports/core-linux-eglibc_2013-12-07/pkg/gcc-4.7/tmp' make: *** [build-core-linux-eglibc] Error 2 Command exited with non-zero status 1 The "unary operator expected" error seems to be caused by this line (libgcc/Makefile.in:291): MULTIOSSUBDIR := $(shell if test $(MULTIOSDIR) != .; then echo /$(MULTIOSDIR); fi)
-rwxr-xr-xbuild8
1 files changed, 4 insertions, 4 deletions
diff --git a/build b/build
index 85ed91d..676271a 100755
--- a/build
+++ b/build
@@ -115,7 +115,7 @@ $(buildnative_targets):
libsubincludedir="$${libsubdir}/include" \
fincludedir="$${libsubdir}/finclude" \
toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=
+ MULTIOSDIR=.
if [ '$(OPK_BUILD_ARCH)' = '$(OPK_HOST_ARCH)' ]; then \
cd "$(builddir)" && make -k check; \
fi
@@ -129,7 +129,7 @@ $(buildcross_targets):
libsubincludedir="$${libsubdir}/include" \
fincludedir="$${libsubdir}/finclude" \
toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=
+ MULTIOSDIR=.
build: $(build_targets)
touch $@
@@ -158,7 +158,7 @@ $(installnative_targets):
libsubincludedir="$${libsubdir}/include" \
fincludedir="$${libsubdir}/finclude" \
toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=
+ MULTIOSDIR=.
# Change the target architecture prefix of files in /usr/bin.
rm -f $(destdir)/usr/bin/*-gcc-$(base_version).*
for f in c++ g++ gcc gcc-ar gcc-nm gcc-ranlib; do \
@@ -290,7 +290,7 @@ $(installcross_targets):
libsubincludedir="$${libsubdir}/include" \
fincludedir="$${libsubdir}/finclude" \
toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=
+ MULTIOSDIR=.
# Change the target architecture prefix of files in /usr/bin.
rm -f $(destdir)/usr/bin/*-gcc-$(base_version).*
for f in c++ g++ gcc gcc-ar gcc-nm gcc-ranlib; do \