From 73416888d1970ae48920ba7ee25a0660881e36cb Mon Sep 17 00:00:00 2001 From: Michael Haberler Date: Sat, 8 Aug 2015 17:18:14 +0200 Subject: [PATCH] configure: reorder custom profile handling until variables known otherwise configure doesnt finish properly. example: CC=gcc ./configure --profile=arm make ... gzip: /doc/CK_ARRAY_FOREACH: No such file or directory gzip: /doc/ck_array_buffer: No such file or directory Makefile:161: recipe for target 'all' failed make[1]: *** [all] Interrupt Makefile:23: recipe for target 'doc' failed --- configure | 59 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/configure b/configure index f88c876..dd9c1da 100755 --- a/configure +++ b/configure @@ -274,35 +274,6 @@ POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"} RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"} VMA_BITS=${VMA_BITS:-"unknown"} -if test "$PROFILE"; then - printf "Using user-specified profile....." - - if test -z "$CC"; then - echo "failed [specify compiler]" - exit $EXIT_FAILURE - fi - - if test ! -f build/ck.build.$PROFILE; then - echo "failed [$PROFILE]" - exit $EXIT_FAILURE - fi - - echo "success [$PROFILE]" - printf "Generating header files.........." - generate include/ck_md.h.in include/ck_md.h - echo "success" - printf "Generating build files..........." - generate doc/Makefile.in doc/Makefile - generate build/ck.build.in build/ck.build - generate build/regressions.build.in build/regressions.build - generate build/ck.pc.in build/ck.pc - generate build/ck.spec.in build/ck.spec - generate Makefile.in Makefile - echo "success" - generate_stdout - exit $EXIT_SUCCESS -fi - DCORES=2 printf "Detecting operating system......." SYSTEM=`uname -s 2> /dev/null` @@ -690,6 +661,36 @@ EOF fi done +if test "$PROFILE"; then + printf "Using user-specified profile....." + + if test -z "$CC"; then + echo "failed [specify compiler]" + exit $EXIT_FAILURE + fi + + if test ! -f build/ck.build.$PROFILE; then + echo "failed [$PROFILE]" + exit $EXIT_FAILURE + fi + + echo "success [$PROFILE]" + printf "Generating header files.........." + generate include/ck_md.h.in include/ck_md.h + echo "success" + printf "Generating build files..........." + generate src/Makefile.in src/Makefile + generate doc/Makefile.in doc/Makefile + generate build/ck.build.in build/ck.build + generate build/regressions.build.in build/regressions.build + generate build/ck.pc.in build/ck.pc + generate build/ck.spec.in build/ck.spec + generate Makefile.in Makefile + echo "success" + generate_stdout + exit $EXIT_SUCCESS +fi + # Platform will be used as a macro. PROFILE="${PROFILE:-$PLATFORM}" PLATFORM="__${PLATFORM}__"