Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/compilation/cust_rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SHELL := /bin/bash
# echo "##### $(MAKELEVEL) ########################################"
ifeq ($(MAKELEVEL),0)

BUILD_HOST_TYPE_CMD := "case `uname` in Linux*) echo LINUX;; CYGWIN*) echo CYGWIN;; Windows*) echo WINDOWS;; *) echo UNKNOWN;; esac"
BUILD_HOST_TYPE_CMD := "case `uname` in Linux*) echo LINUX;; CYGWIN*) echo CYGWIN;; MINGW*) echo CYGWIN;; Windows*) echo WINDOWS;; *) echo UNKNOWN;; esac"
export BUILD_HOST_TYPE := $(shell sh -c $(BUILD_HOST_TYPE_CMD))

ifeq "$(BUILD_HOST_TYPE)" "UNKNOWN"
Expand Down
2 changes: 2 additions & 0 deletions platform/compilation/elfCombine.pl
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,12 @@ sub elf_combine
dbg_out("1", "parameter ok");

my $cwd = getcwd();
$input_elf_file_1 = abs_path($input_elf_file_1);
my $index1 = index($input_elf_file_1,$cwd)+length($cwd)+1;
my $index2 = length($input_elf_file_1);
$input_elf_file_1 = substr($input_elf_file_1,$index1,$index2);
# print "\n----$input_elf_file_1------\n";
$input_elf_file_2 = abs_path($input_elf_file_2);
$index1 = index($input_elf_file_2,$cwd)+length($cwd)+1;
$index2 = length($input_elf_file_2);
$input_elf_file_2 = substr($input_elf_file_2,$index1,$index2);
Expand Down