Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52513434 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 9fc7d3d6: am 2ce7528a: Merge "makeparallel needs global CFLAGS now" 

* commit '9fc7d3d6':
  makeparallel needs global CFLAGS now
parents 08c48280 9fc7d3d6

core/ninja.mk

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ KATI_INTERMEDIATES_PATH := $(HOST_OUT_INTERMEDIATES)/EXECUTABLES/ckati_intermedi 
KATI_BIN_PATH := $(HOST_OUT_EXECUTABLES)

include build/kati/Makefile.ckati



MAKEPARALLEL_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CPPFLAGS)

MAKEPARALLEL_CXX := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_CFLAGS) $(CLANG_HOST_GLOBAL_CPPFLAGS)

MAKEPARALLEL_LD := $(CLANG_CXX) $(CLANG_HOST_GLOBAL_LDFLAGS)

# Build static makeparallel. Unfortunately Mac OS X doesn't officially support static exectuables.

ifeq ($(BUILD_OS),linux)