diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile | 19 | ||||
-rw-r--r-- | tests/args/test.bad | 2 | ||||
-rwxr-xr-x | tests/run_tests | 3 |
4 files changed, 15 insertions, 10 deletions
@@ -9,4 +9,5 @@ a.out /gcc-config-*.tar.* +/.gcc-config /wrapper @@ -14,21 +14,24 @@ LIBEXECDIR = $(LIBDIR)/misc MKDIR_P = mkdir -p -m 755 INSTALL_EXE = install -m 755 -all: wrapper +all: .gcc-config wrapper clean: - rm -f wrapper *.o core + rm -f .gcc-config wrapper *.o core -install: all - $(MKDIR_P) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBEXECDIR) - $(INSTALL_EXE) wrapper $(DESTDIR)$(LIBEXECDIR)/$(PN) +.gcc-config: gcc-config sed \ -e 's:@GENTOO_LIBDIR@:$(SUBLIBDIR):g' \ -e 's:@PV@:$(PV):g' \ - gcc-config > $(DESTDIR)$(BINDIR)/gcc-config - chmod a+rx $(DESTDIR)$(BINDIR)/gcc-config + $< > $@ + chmod a+rx $@ + +install: all + $(MKDIR_P) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBEXECDIR) + $(INSTALL_EXE) wrapper $(DESTDIR)$(LIBEXECDIR)/$(PN) + $(INSTALL_EXE) .gcc-config $(DESTDIR)$(BINDIR)/gcc-config -test check: +test check: .gcc-config cd tests && ./run_tests dist: diff --git a/tests/args/test.bad b/tests/args/test.bad index d8a9df2..80a646a 100644 --- a/tests/args/test.bad +++ b/tests/args/test.bad @@ -9,4 +9,4 @@ for f in "${flags[@]}" ; do gcc-config ${f} && exit 1 done -exec gcc-config -h >/dev/null +gcc-config -h >/dev/null diff --git a/tests/run_tests b/tests/run_tests index b0a45c0..2ff7d77 100755 --- a/tests/run_tests +++ b/tests/run_tests @@ -22,7 +22,7 @@ vars=( CHOST GCC_CONFIG ROOT TROOT NOCOLOR RC_NOCOLOR ) unset ${vars[@]} TROOT=${PWD} -GCC_CONFIG="${TROOT}/../gcc-config" +GCC_CONFIG="${TROOT}/../.gcc-config" if ! "${GCC_CONFIG}" --help >/dev/null ; then die "could not find gcc-config in ${TROOT}/../" fi @@ -86,6 +86,7 @@ for t in "$@" ; do cd "${ROOT}" $(for v in PATH ${vars[@]} ; do printf '%s="%s"\n' ${v} "${!v}" ; done) export ${vars[@]} + gcc-config() { bash -c ". \${GCC_CONFIG}" gcc-config "\$@" ; } . ./${test} EOF chmod a+rx "${r}" |