diff options
| author | Andy Polyakov <appro@openssl.org> | 2008-12-30 13:26:26 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2008-12-30 13:26:26 +0000 |
| commit | 1ff7b6492bdab064695ba76fe624001ee6e6b625 (patch) | |
| tree | 932a88fa0ca737e5ff2a0e5f85c4f47c4d8b2d27 /Makefile.org | |
| parent | 20900d68015b833de3371c4ad085c25788158a3b (diff) | |
Some seasoned makes fail to build. For reference. I had problem with Irix
make which doesn't tolerate empty targets, and fips/Makefile ends up with
one when FIPSCANLIB is empty. Build failed as early as 'make links' phase.
Diffstat (limited to 'Makefile.org')
| -rw-r--r-- | Makefile.org | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 0a2964f88f..4be7dad7d6 100644 --- a/Makefile.org +++ b/Makefile.org @@ -219,7 +219,8 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' \ MD5_ASM_OBJ='${MD5_ASM_OBJ}' \ RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' \ - FIPSLIBDIR='${FIPSLIBDIR}' FIPSCANLIB='${FIPSCANLIB}' \ + FIPSLIBDIR='${FIPSLIBDIR}' \ + FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \ FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}' \ FIPS_EX_OBJ='${FIPS_EX_OBJ}' \ THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES= @@ -240,7 +241,8 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ # subdirectories defined in $(DIRS). It requires that the target # is given through the shell variable `target'. BUILD_CMD= if [ -d "$$dir" ]; then \ - ( cd $$dir && echo "making $$target in $$dir..." && \ + ( [ $$target != all -a -z "$(FIPSCANLIB)" ] && FIPSCANLIB=/dev/null; \ + cd $$dir && echo "making $$target in $$dir..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \ ) || exit 1; \ fi |