diff options
-rw-r--r-- | rbutil/libtools.make | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make index 93ce9532a6..4037276104 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make | |||
@@ -64,7 +64,7 @@ ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | |||
64 | # when building libs for OS X build for both i386 and ppc at the same time. | 64 | # when building libs for OS X build for both i386 and ppc at the same time. |
65 | # This creates fat objects, and ar can only create the archive but not operate | 65 | # This creates fat objects, and ar can only create the archive but not operate |
66 | # on it. As a result the ar call must NOT use the u (update) flag. | 66 | # on it. As a result the ar call must NOT use the u (update) flag. |
67 | CFLAGS += -arch ppc -arch i386 | 67 | ARCHFLAGS += -arch ppc -arch i386 |
68 | # building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode) | 68 | # building against SDK 10.4 is not compatible with gcc-4.2 (default on newer Xcode) |
69 | # might need adjustment for older Xcode. | 69 | # might need adjustment for older Xcode. |
70 | CC = gcc-4.0 | 70 | CC = gcc-4.0 |
@@ -76,7 +76,7 @@ WINDRES = windres | |||
76 | BUILD_DIR ?= $(TARGET_DIR)build$(COMPILETARGET) | 76 | BUILD_DIR ?= $(TARGET_DIR)build$(COMPILETARGET) |
77 | 77 | ||
78 | ifdef RBARCH | 78 | ifdef RBARCH |
79 | CFLAGS += -arch $(RBARCH) | 79 | ARCHFLAGS += -arch $(RBARCH) |
80 | OBJDIR = $(abspath $(BUILD_DIR)/$(RBARCH))/ | 80 | OBJDIR = $(abspath $(BUILD_DIR)/$(RBARCH))/ |
81 | else | 81 | else |
82 | OBJDIR = $(abspath $(BUILD_DIR))/ | 82 | OBJDIR = $(abspath $(BUILD_DIR))/ |
@@ -106,7 +106,7 @@ $(BINARY): $(OBJS) $(EXTRADEPS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) | |||
106 | @echo LD $@ | 106 | @echo LD $@ |
107 | $(SILENT)$(call mkdir,$(dir $@)) | 107 | $(SILENT)$(call mkdir,$(dir $@)) |
108 | # EXTRADEPS need to be built into OBJDIR. | 108 | # EXTRADEPS need to be built into OBJDIR. |
109 | $(SILENT)$(CROSS)$(CC) $(CFLAGS) $(LDOPTS) -o $(BINARY) \ | 109 | $(SILENT)$(CROSS)$(CC) $(ARCHFLAGS) $(CFLAGS) $(LDOPTS) -o $(BINARY) \ |
110 | $(OBJS) $(addprefix $(OBJDIR),$(EXTRADEPS)) \ | 110 | $(OBJS) $(addprefix $(OBJDIR),$(EXTRADEPS)) \ |
111 | $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) | 111 | $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) |
112 | 112 | ||
@@ -114,7 +114,7 @@ $(BINARY): $(OBJS) $(EXTRADEPS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) | |||
114 | $(OBJDIR)%.o: | 114 | $(OBJDIR)%.o: |
115 | @echo CC $< | 115 | @echo CC $< |
116 | $(SILENT)$(call mkdir,$(dir $@)) | 116 | $(SILENT)$(call mkdir,$(dir $@)) |
117 | $(SILENT)$(CROSS)$(CC) $(CFLAGS) -c -o $@ $< | 117 | $(SILENT)$(CROSS)$(CC) $(ARCHFLAGS) $(CFLAGS) -c -o $@ $< |
118 | 118 | ||
119 | # lib rules | 119 | # lib rules |
120 | lib$(OUTPUT)$(RBARCH).a: $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a | 120 | lib$(OUTPUT)$(RBARCH).a: $(TARGET_DIR)lib$(OUTPUT)$(RBARCH).a |
@@ -128,7 +128,7 @@ $(OUTPUT).dll: $(TARGET_DIR)$(OUTPUT).dll | |||
128 | $(TARGET_DIR)$(OUTPUT).dll: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) | 128 | $(TARGET_DIR)$(OUTPUT).dll: $(LIBOBJS) $(addprefix $(OBJDIR),$(EXTRALIBOBJS)) |
129 | @echo DLL $(notdir $@) | 129 | @echo DLL $(notdir $@) |
130 | $(SILENT)$(call mkdir,$(dir $@)) | 130 | $(SILENT)$(call mkdir,$(dir $@)) |
131 | $(SILENT)$(CROSS)$(CC) $(CFLAGS) -shared -o $@ $^ \ | 131 | $(SILENT)$(CROSS)$(CC) $(ARCHFLAGS) $(CFLAGS) -shared -o $@ $^ \ |
132 | -Wl,--output-def,$(TARGET_DIR)$(OUTPUT).def | 132 | -Wl,--output-def,$(TARGET_DIR)$(OUTPUT).def |
133 | 133 | ||
134 | # create lib file from objects | 134 | # create lib file from objects |