mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-07-21 18:29:45 +00:00
Revert r66315. Fix the build on mixed 64/32 Linux systems.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66350 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
0acf6b00f3
commit
34d7455ebc
@ -458,9 +458,9 @@ endif
|
|||||||
ifneq ($(OS),Darwin)
|
ifneq ($(OS),Darwin)
|
||||||
ifdef TOOLNAME
|
ifdef TOOLNAME
|
||||||
ifdef EXAMPLE_TOOL
|
ifdef EXAMPLE_TOOL
|
||||||
LD.Flags += $(RPATH) -Wl,$(ExmplDir) -export-dynamic
|
LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
|
||||||
else
|
else
|
||||||
LD.Flags += $(RPATH) -Wl,$(ToolDir) -export-dynamic
|
LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -516,14 +516,6 @@ ifdef UNIVERSAL
|
|||||||
|
|
||||||
# Building universal cannot compute dependencies automatically.
|
# Building universal cannot compute dependencies automatically.
|
||||||
DISABLE_AUTO_DEPENDENCIES=1
|
DISABLE_AUTO_DEPENDENCIES=1
|
||||||
else
|
|
||||||
ifeq ($(ARCH),x86_64)
|
|
||||||
CompileCommonOpts += -m64
|
|
||||||
else
|
|
||||||
ifeq ($(ARCH),i386)
|
|
||||||
CompileCommonOpts += -m32
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS),SunOS)
|
ifeq ($(OS),SunOS)
|
||||||
|
Loading…
Reference in New Issue
Block a user