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

Commit 4863dafc authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove make variables exported from Soong 

These have all been strictly checked by Soong, so the values currently
match. Just remove them so that the make variables exported by Soong
will take over.

This also removes some of the GCC reconfiguration, since we haven't
implemented that in Soong. If it becomes useful in the future, we'll
implement it there.

Some things like TARGET_TOOCHAIN_ROOT can nearly be removed, but are
used before the Soong-exported make_vars.mk is loaded. In that case,
added to the clang cflags, so it can be removed once the cflags are
removed.

Others, like LLVM_PREBUILTS_VERSION are loaded even earlier -- in
envsetup.sh before we've even configured Soong. So for now, keep the
Make definition, and continue ensuring it's the same as the Soong
version.

Change-Id: I554b27062ac43610828a8c06d640d919a2dc21ca
parent a794f4db

buildspec.mk.default

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ endif 
# will be added to LOCAL_CFLAGS when building the module.

#DEBUG_MODULE_ModuleName:=true



# Specify an alternative tool chain prefix if needed.

#TARGET_TOOLS_PREFIX:=



# Specify the extra CFLAGS to use when building a module whose

# DEBUG_MODULE_ variable is set.  Host and device flags are handled

# separately.

core/clang/config.mk

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
LLVM_PREBUILTS_PATH := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin

LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib64/clang/$(LLVM_RELEASE_VERSION)/lib/linux/



CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)

CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)

LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX)

LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)



CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)

LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)

core/combo/HOST_CROSS_windows-x86.mk

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ $(combo_var_prefix)GLOBAL_CFLAGS += -Wno-unused-parameter 
$(combo_var_prefix)GLOBAL_CFLAGS += --sysroot prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32

$(combo_var_prefix)GLOBAL_CFLAGS += -m32

$(combo_var_prefix)GLOBAL_LDFLAGS += -m32

TOOLS_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/bin/x86_64-w64-mingw32-

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include

$(combo_var_prefix)GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32
@@ -37,12 +36,6 @@ $(combo_var_prefix)GLOBAL_CFLAGS += -D_WIN32_WINNT=0x0600 -DWINVER=0x0600 
# Get 64-bit off_t and related functions.

$(combo_var_prefix)GLOBAL_CFLAGS += -D_FILE_OFFSET_BITS=64



$(combo_var_prefix)CC := $(TOOLS_PREFIX)gcc

$(combo_var_prefix)CXX := $(TOOLS_PREFIX)g++

$(combo_var_prefix)AR := $(TOOLS_PREFIX)ar

$(combo_var_prefix)NM := $(TOOLS_PREFIX)nm

$(combo_var_prefix)OBJDUMP := $(TOOLS_PREFIX)objdump



define $(combo_var_prefix)transform-shared-lib-to-toc

$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2)

$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2)

core/combo/HOST_CROSS_windows-x86_64.mk

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ $(combo_var_prefix)GLOBAL_CFLAGS += -Wno-unused-parameter 
$(combo_var_prefix)GLOBAL_CFLAGS += --sysroot prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32

$(combo_var_prefix)GLOBAL_CFLAGS += -m64

$(combo_var_prefix)GLOBAL_LDFLAGS += -m64

TOOLS_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/bin/x86_64-w64-mingw32-

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include

$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include

$(combo_var_prefix)GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib64
@@ -37,12 +36,6 @@ $(combo_var_prefix)GLOBAL_CFLAGS += -D_WIN32_WINNT=0x0600 -DWINVER=0x0600 
# Get 64-bit off_t and related functions.

$(combo_var_prefix)GLOBAL_CFLAGS += -D_FILE_OFFSET_BITS=64



$(combo_var_prefix)CC := $(TOOLS_PREFIX)gcc

$(combo_var_prefix)CXX := $(TOOLS_PREFIX)g++

$(combo_var_prefix)AR := $(TOOLS_PREFIX)ar

$(combo_var_prefix)NM := $(TOOLS_PREFIX)nm

$(combo_var_prefix)OBJDUMP := $(TOOLS_PREFIX)objdump



define $(combo_var_prefix)transform-shared-lib-to-toc

$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2)

$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2)

core/combo/HOST_darwin-x86.mk

+0 −11
Original line number Diff line number Diff line
@@ -31,21 +31,10 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CO 


include $(BUILD_COMBOS)/mac_version.mk



$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT := prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin11

$(combo_2nd_arch_prefix)HOST_CC  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-gcc

$(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-g++



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_macho,$(1),$(2))

endef



# gcc location for clang; to be updated when clang is updated

# HOST_TOOLCHAIN_ROOT is a Darwin-specific define

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)



$(combo_2nd_arch_prefix)HOST_AR := $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar



$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version) -DMACOSX_DEPLOYMENT_TARGET=$(mac_sdk_version)

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -Wl,-syslibroot,$(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)