mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-22 18:54:02 +01:00
Revert r66315. Fix the build on mixed 64/32 Linux systems.
llvm-svn: 66350
This commit is contained in:
parent
2caf3ea50c
commit
aabb2cbf1c
@ -458,9 +458,9 @@ endif
|
||||
ifneq ($(OS),Darwin)
|
||||
ifdef TOOLNAME
|
||||
ifdef EXAMPLE_TOOL
|
||||
LD.Flags += $(RPATH) -Wl,$(ExmplDir) -export-dynamic
|
||||
LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
|
||||
else
|
||||
LD.Flags += $(RPATH) -Wl,$(ToolDir) -export-dynamic
|
||||
LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@ -516,14 +516,6 @@ ifdef UNIVERSAL
|
||||
|
||||
# Building universal cannot compute dependencies automatically.
|
||||
DISABLE_AUTO_DEPENDENCIES=1
|
||||
else
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CompileCommonOpts += -m64
|
||||
else
|
||||
ifeq ($(ARCH),i386)
|
||||
CompileCommonOpts += -m32
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS),SunOS)
|
||||
|
Loading…
Reference in New Issue
Block a user