diff options
Diffstat (limited to 'portage/Android.mk')
| -rw-r--r-- | portage/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/portage/Android.mk b/portage/Android.mk index 13d1cc6..90db666 100644 --- a/portage/Android.mk +++ b/portage/Android.mk @@ -26,7 +26,6 @@ TARGET_KEYWORD := $(call gentoo-arch,$(TARGET_ARCH)) TARGET_RANLIB ?= $(TARGET_AR:ar=ranlib) MAIN_OVERLAY_REPO := `readlink -f $(LOCAL_PATH)`/../../overlays/gentoo -MAIN_OVERLAY_REPO_REL := $(LOCAL_PATH)/../../overlays/gentoo include $(CLEAR_VARS) @@ -38,7 +37,7 @@ make.profile := $(3RD_PARTY_ROOT)/etc/portage/make.profile $(make.profile): $(hide)mkdir -p $(dir $@) $(hide)ln -sfT \ - `echo $(dir $@) | sed 's:[^/]*/:../:g'`/$(MAIN_OVERLAY_REPO_REL)/profiles/default/linux/$(TARGET_KEYWORD) \ + $(MAIN_OVERLAY_REPO)/profiles/default/linux/$(TARGET_KEYWORD) \ $@ LOCAL_MODULE := make.conf @@ -64,7 +63,7 @@ $(make.conf): $(LOCAL_PATH)/make.conf.in $(make.profile) -e 's:@ARCH@:$(TARGET_ARCH):g' \ -e 's:@CBUILD@:$(CBUILD):g' \ -e 's:@CHOST@:$(CHOST):g' \ - -e 's:@COMMON_OBJ@:$${ANDROID_BUILD_TOP}/$(TARGET_OUT_COMMON_GENTOO):' \ + -e 's:@COMMON_OBJ@:$(if $(filter /%,$(TARGET_OUT_COMMON_GENTOO)),,$${ANDROID_BUILD_TOP}/)$(TARGET_OUT_COMMON_GENTOO):g' \ -e 's:@PRODUCT_OBJ@:$${ANDROID_PRODUCT_OUT}/obj/gentoo:g' \ -e 's:@PORTAGE_PREFIX@:$(PORTAGE_PREFIX):g' \ -e 's:@LIBDIR@:$(3RD_PARTY_LIBDIR):' \ |