mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-29 10:25:12 +00:00
Missed this as part of r67451.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@67500 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -437,7 +437,7 @@ ifeq ($(OS),Darwin)
|
|||||||
|
|
||||||
SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress -Wl,-dylib \
|
SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress -Wl,-dylib \
|
||||||
-mmacosx-version-min=$(DARWIN_VERSION)
|
-mmacosx-version-min=$(DARWIN_VERSION)
|
||||||
CompileCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
|
TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
|
||||||
else
|
else
|
||||||
ifeq ($(OS),Cygwin)
|
ifeq ($(OS),Cygwin)
|
||||||
SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \
|
SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \
|
||||||
@@ -536,10 +536,10 @@ ifdef UNIVERSAL
|
|||||||
else
|
else
|
||||||
ifeq ($(OS),Darwin)
|
ifeq ($(OS),Darwin)
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
CompileCommonOpts += -m64
|
TargetCommonOpts = -m64
|
||||||
else
|
else
|
||||||
ifeq ($(ARCH),x86)
|
ifeq ($(ARCH),x86)
|
||||||
CompileCommonOpts += -m32
|
TargetCommonOpts = -m32
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -560,33 +560,35 @@ CPP.Flags += $(sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
|
|||||||
|
|
||||||
ifeq ($(BUILD_COMPONENT), 1)
|
ifeq ($(BUILD_COMPONENT), 1)
|
||||||
Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
|
Compile.C = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
|
||||||
$(CompileCommonOpts) -c
|
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
||||||
Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
Compile.CXX = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
||||||
$(CompileCommonOpts) -c
|
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
||||||
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) \
|
Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(TargetCommonOpts) \
|
||||||
$(CXX.Flags.NoRelink) -E
|
$(CompileCommonOpts) $(CXX.Flags) $(CXX.Flags.NoRelink) -E
|
||||||
Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
Link = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
||||||
$(CompileCommonOpts) $(LD.Flags) $(Strip)
|
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
|
||||||
Relink = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) \
|
Relink = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) \
|
||||||
$(Relink.Flags)
|
$(CompileCommonOpts) $(Relink.Flags)
|
||||||
else
|
else
|
||||||
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
|
Compile.C = $(CC) $(CPP.Flags) $(C.Flags) $(C.Flags.NoRelink) \
|
||||||
$(CompileCommonOpts) -c
|
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
||||||
Compile.CXX = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
Compile.CXX = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
||||||
$(CompileCommonOpts) -c
|
$(TargetCommonOpts) $(CompileCommonOpts) -c
|
||||||
Preprocess.CXX= $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) \
|
Preprocess.CXX= $(CXX) $(CPP.Flags) $(TargetCommonOpts) \
|
||||||
$(CXX.Flags.NoRelink) -E
|
$(CompileCommonOpts) $(CXX.Flags) $(CXX.Flags.NoRelink) -E
|
||||||
Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
Link = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXX.Flags.NoRelink) \
|
||||||
$(CompileCommonOpts) $(LD.Flags) $(Strip)
|
$(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) $(Strip)
|
||||||
Relink = $(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) \
|
Relink = $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) \
|
||||||
$(Relink.Flags)
|
$(CompileCommonOpts) $(Relink.Flags)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts)
|
BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(C.Flags) \
|
||||||
Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -E
|
$(TargetCommonOpts) $(CompileCommonOpts)
|
||||||
|
Preprocess.C = $(CC) $(CPP.Flags) $(C.Flags) \
|
||||||
|
$(TargetCommonOpts) $(CompileCommonOpts) -E
|
||||||
|
|
||||||
BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CXX.Flags) \
|
BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CXX.Flags) \
|
||||||
$(CompileCommonOpts)
|
$(TargetCommonOpts) $(CompileCommonOpts)
|
||||||
|
|
||||||
ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755
|
ProgInstall = $(INSTALL) $(Install.StripFlag) -m 0755
|
||||||
ScriptInstall = $(INSTALL) -m 0755
|
ScriptInstall = $(INSTALL) -m 0755
|
||||||
|
Reference in New Issue
Block a user