diff options
| author | Brandon Bennett <bennetb@gmail.com> | 2012-12-13 16:59:25 -0700 |
|---|---|---|
| committer | Brandon Bennett <bennetb@gmail.com> | 2012-12-13 16:59:25 -0700 |
| commit | 24fbed339b511b636fa5cb4b984081ab3b6c6df0 (patch) | |
| tree | 4141e67589352bc589250202cf29fe01b21d2651 /core | |
| parent | 23974c8a8a29476569dbb777d6a13200d3a72a50 (diff) | |
| download | build-24fbed339b511b636fa5cb4b984081ab3b6c6df0.zip build-24fbed339b511b636fa5cb4b984081ab3b6c6df0.tar.gz build-24fbed339b511b636fa5cb4b984081ab3b6c6df0.tar.bz2 | |
Make sed in-place more portable
In-place sed (sed -i) works differents for GNU vs BSD version like
what is found on OS X.
This adds a check and does a sed -i for GNU and a sed -i '' for
Darwin only.
This allows my OS X machine to fully compile CM without the need
for any GNU specific packages.
Change-Id: Ic8aada282db9dbe8995aa1fc7b7eebe997a1a5fb
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/config.mk | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index d7d70f7..98cd055 100644 --- a/core/Makefile +++ b/core/Makefile @@ -734,7 +734,7 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop @echo -e ${CL_YLW}"Modifying default.prop"${CL_RST} - sed -i 's/ro.build.date.utc=.*/ro.build.date.utc=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop + $(SED_INPLACE) 's/ro.build.date.utc=.*/ro.build.date.utc=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop @echo -e ${CL_CYN}"----- Made recovery filesystem --------"$(TARGET_RECOVERY_ROOT_OUT)${CL_RST} @touch $(TARGET_RECOVERY_ROOT_TIMESTAMP) diff --git a/core/config.mk b/core/config.mk index 4090759..e6bf7af 100644 --- a/core/config.mk +++ b/core/config.mk @@ -361,6 +361,13 @@ else MD5SUM:=md5sum endif +# In-place sed is done different in linux than OS X +ifeq ($(HOST_OS),darwin) +SED_INPLACE:=sed -i '' +else +SED_INPLACE:=sed -i +endif + APICHECK_CLASSPATH := $(HOST_JDK_TOOLS_JAR) APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) |