diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/MesaLib/patches/patch-src_glsl_apps_Makefile | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/MesaLib/patches/patch-src_glsl_apps_Makefile')
| -rw-r--r-- | package/MesaLib/patches/patch-src_glsl_apps_Makefile | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile new file mode 100644 index 000000000..175965dc5 --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_apps_Makefile @@ -0,0 +1,15 @@ +--- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-04-19 21:20:55.000000000 +0200 +@@ -26,10 +26,10 @@ INCLUDES = -I. + .SUFFIXES: .c + + .c: +- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ ++ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ + + .c.o: +- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ ++ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ + + + ##### TARGETS ##### |