This is an archive of the discontinued LLVM Phabricator instance.

Differential D12909

Fix Makefile for Windows to Android tests.
ClosedPublic

Authored by chaoren on Sep 16 2015, 10:50 AM.

Details

Reviewers
zturner
Commits
rGd761a9532bc6: Fix Makefile for Windows to Android tests.
rLLDB247857: Fix Makefile for Windows to Android tests.
rL247857: Fix Makefile for Windows to Android tests.

Diff Detail

Repository
rL LLVM

Event Timeline

chaoren updated this revision to Diff 34905.Sep 16 2015, 10:50 AM
chaoren retitled this revision from to Fix Makefile for Windows to Android tests..
chaoren updated this object.
chaoren added a reviewer: zturner.
chaoren added a subscriber: lldb-commits.
Herald added subscribers: danalbert, tberghammer. · View Herald TranscriptSep 16 2015, 10:50 AM
Closed by commit rL247857: Fix Makefile for Windows to Android tests. (authored by chaoren). · Explain WhySep 16 2015, 2:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
test/
make/
11 lines

Diff 34929

lldb/trunk/test/make/Makefile.rules

Show First 20 Lines • Show All 67 Lines • ▼ Show 20 Lines
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# If OS is not defined, use 'uname -s' to determine the OS name. # If OS is not defined, use 'uname -s' to determine the OS name.
# #
# uname on Windows gives "windows32", but most environments standardize # uname on Windows gives "windows32", but most environments standardize
# on "Windows_NT", so we'll make it consistent here. When running # on "Windows_NT", so we'll make it consistent here. When running
# tests from Visual Studio, the environment variable isn't inherited # tests from Visual Studio, the environment variable isn't inherited
# all the way down to the process spawned for make. # all the way down to the process spawned for make.
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq "$(OS)" "" HOST_OS = $(shell uname -s)
OS = $(shell uname -s) ifeq "$(HOST_OS)" "windows32"
HOST_OS = Windows_NT
endif endif
ifeq "$(OS)" "windows32" ifeq "$(OS)" ""
OS = Windows_NT OS = $(HOST_OS)
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# If ARCH is not defined, default to x86_64. # If ARCH is not defined, default to x86_64.
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq "$(ARCH)" "" ifeq "$(ARCH)" ""
ifeq "$(OS)" "Windows_NT" ifeq "$(OS)" "Windows_NT"
ARCH = x86 ARCH = x86
▲ Show 20 Lines • Show All 391 Lines • ▼ Show 20 Linesifneq "$(DYLIB_NAME)" ""
DYLIB_DWOS := $(DYLIB_OBJECTS:.o=.dwo) DYLIB_DWOS := $(DYLIB_OBJECTS:.o=.dwo)
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Rule for Generating Prerequisites Automatically using .d files and # Rule for Generating Prerequisites Automatically using .d files and
# the compiler -MM option. The -M option will list all system headers, # the compiler -MM option. The -M option will list all system headers,
# and the -MM option will list all non-system dependencies. # and the -MM option will list all non-system dependencies.
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq "$(OS)" "Windows_NT" ifeq "$(HOST_OS)" "Windows_NT"
JOIN_CMD = & JOIN_CMD = &
QUOTE = " QUOTE = "
else else
JOIN_CMD = ; JOIN_CMD = ;
QUOTE = ' QUOTE = '
endif endif
%.d: %.c %.d: %.c
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines