mesa3d-dev

[Mesa3d-dev] [PATCH] Fix build with --enable-32-bit. again.

[Török E. <edw...@gm...>]

CFLAGS needs to be passed, as you already know.
Commit 3e17a5b047124c46ee45dbd1848127c67e0d62f3 broke this by adding a new link
command without CFLAGS.

Signed-off-by: Török Edwin <edw...@gm...>
---
 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 f19cc03..4cdd51e 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) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
+	$(CC) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
 	@rm -f $@.test
 	mv -f $@.tmp $@
 
-- 
1.7.0

Re: [Mesa3d-dev] [PATCH] Fix build with --enable-32-bit. again.

[Dan N. <dbn...@gm...>]

2010/4/9 Török Edwin <edw...@gm...>:
> CFLAGS needs to be passed, as you already know.
> Commit 3e17a5b047124c46ee45dbd1848127c67e0d62f3 broke this by adding a new link
> command without CFLAGS.
>
> Signed-off-by: Török Edwin <edw...@gm...>
> ---
>  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 f19cc03..4cdd51e 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) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
> +       $(CC) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
>        @rm -f $@.test
>        mv -f $@.tmp $@
>
> --

Good catch, although it really affects anyone that stores flags
necessary to the linker in CFLAGS. Could you also fix the one in
src/gallium/winsys/drm/Makefile.template from the same commit and
repost the patch? Thanks.

--
Dan

Re: [Mesa3d-dev] [PATCH] Fix build with --enable-32-bit. again.

[Török E. <edw...@gm...>]

2010/4/9 Dan Nicholson <dbn...@gm...>:
>
> Good catch, although it really affects anyone that stores flags
> necessary to the linker in CFLAGS. Could you also fix the one in
> src/gallium/winsys/drm/Makefile.template from the same commit and
> repost the patch? Thanks.

Will do that a bit later.

--Edwin

[Mesa3d-dev] [PATCH] Fix build with --enable-32-bit.

[Török E. <edw...@gm...>]

CFLAGS needs to be passed, as you already know.
Commit 3e17a5b047124c46ee45dbd1848127c67e0d62f3 broke this by adding a new link
command without CFLAGS.

Signed-off-by: Török Edwin <edw...@gm...>
---
 src/gallium/targets/Makefile.dri       |    2 +-
 src/mesa/drivers/dri/Makefile.template |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri
index 6d9b81a..16477e3 100644
--- a/src/gallium/targets/Makefile.dri
+++ b/src/gallium/targets/Makefile.dri
@@ -69,7 +69,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
 		$(OBJECTS) $(PIPE_DRIVERS) \
                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
                  $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
-	$(CC) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
+	$(CC) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
 	@rm -f $@.test
 	mv -f $@.tmp $@
 
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index f19cc03..4cdd51e 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) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
+	$(CC) $(CFLAGS) -o $@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@.tmp $(DRI_LIB_DEPS)
 	@rm -f $@.test
 	mv -f $@.tmp $@
 
-- 
1.7.0