Mesa (master): Revert "dri/drivers: fix 32bit builds on 64bit systems"

Dan Nicholson dbn at kemper.freedesktop.org
Mon Apr 12 04:11:03 UTC 2010


Module: Mesa
Branch: master
Commit: 4ebed8638682825100f18682041753ed4233667a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ebed8638682825100f18682041753ed4233667a

Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Sun Apr 11 20:56:22 2010 -0700

Revert "dri/drivers: fix 32bit builds on 64bit systems"

This reverts commit bd09fce27119548cb91cc2aa9ced6a7347aefc3a. Török
Edwin sent the correct fix to the list a couple days ago in
<1270832747-15611-1-git-send-email-edwintorok at gmail.com>.

---

 src/mesa/drivers/dri/Makefile.template |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index c63c74b..f19cc03 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -54,7 +54,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \
 		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o
 	$(MKLIB) -o $@.tmp -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
-	$(CC) $(ARCH_FLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
+	$(CC) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
 	@rm -f $@.test
 	mv -f $@.tmp $@
 




More information about the mesa-commit mailing list