Skip to content

Commit

Permalink
Bug 1418944 - Quote CC/CXX variables passed to nspr r=franziskus
Browse files Browse the repository at this point in the history
The Makefile doesn't put quotes around the assignment of CC variables when
calling the nspr configure (if building with nss_build_all).

This breaks e.g. if someone tries to pass flags in the CC (hacky, but sometimes
makes things easier) or if there are spaces in the path to the compiler. In any
case, quoting makes things cleaner and shouldn't have any downsides.

--HG--
extra : transplant_source : %B6%DFj%0C/%1Ba%D8%B2%1F%3E%1A%87r%94%1C%7B%92%25H
  • Loading branch information
hannob committed Nov 20, 2017
1 parent d7b8bb6 commit d54e6bb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -87,10 +87,10 @@ ifdef NS_USE_GCC
NSPR_CONFIGURE_ENV = CC=gcc CXX=g++
endif
ifdef CC
NSPR_CONFIGURE_ENV = CC=$(CC)
NSPR_CONFIGURE_ENV = CC="$(CC)"
endif
ifdef CCC
NSPR_CONFIGURE_ENV += CXX=$(CCC)
NSPR_CONFIGURE_ENV += CXX="$(CCC)"
endif
# Remove -arch definitions. NSPR can't handle that.
NSPR_CONFIGURE_ENV := $(filter-out -arch x86_64,$(NSPR_CONFIGURE_ENV))
Expand Down

0 comments on commit d54e6bb

Please sign in to comment.