From 6ba956d95d4e8be943eeb0dedb20188e8479219c Mon Sep 17 00:00:00 2001 From: Artem Pianykh Date: Tue, 16 Jun 2020 01:46:00 -0700 Subject: [PATCH] [make] Escape ORIG_SHELL_PATH to avoid issues due to spaces Summary: A space in user's path will lead to a make failure on line 899 of Makefile. Let's espace the path to avoid that. Reviewed By: jvillard Differential Revision: D22044934 fbshipit-source-id: 5a949be1d --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 837deee00..4f1808f4e 100644 --- a/Makefile +++ b/Makefile @@ -898,7 +898,7 @@ devsetup: Makefile.autoconf printf "$(TERM_INFO) export BUILD_MODE=dev$(TERM_RESET)\n" >&2; \ printf "$(TERM_INFO) echo 'export BUILD_MODE=dev' >> \"$$shell_config_file\"$(TERM_RESET)\n" >&2; \ fi - $(QUIET)PATH=$(ORIG_SHELL_PATH); if [ "$$(ocamlc -where 2>/dev/null)" != "$$($(OCAMLC) -where)" ]; then \ + $(QUIET)PATH='$(ORIG_SHELL_PATH)'; if [ "$$(ocamlc -where 2>/dev/null)" != "$$($(OCAMLC) -where)" ]; then \ echo >&2; \ echo '$(TERM_INFO)*** NOTE: The current shell is not set up for the right opam switch.$(TERM_RESET)' >&2; \ echo '$(TERM_INFO)*** NOTE: Please run:$(TERM_RESET)' >&2; \