diff options
| author | Matt Turner <[email protected]> | 2012-10-01 13:00:18 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-10-03 13:41:09 -0700 |
| commit | 31ab61cac10bf75210134b6d8a354ac3cbd3b4da (patch) | |
| tree | 5c83b24f296935a55466b7188e1780ac0890de93 /src/mesa/drivers/dri/i915 | |
| parent | 551c991606e543c3a264a762026f11348b37947e (diff) | |
dri drivers: Link dricommon before dynamic libraries
I think libtool should be handling this for us, but the build fails for
Jordan because libdricommon (a static library, which uses expat) appears
before -lexpat on the linker command.
Reviewed-by: Jordan Justen <[email protected]>
Tested-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index 85bb09e5e94..32986d1c87b 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -52,9 +52,9 @@ i915_dri_la_SOURCES = \ i915_dri_la_LDFLAGS = -module -avoid-version -shared i915_dri_la_LIBADD = \ + ../common/libdricommon.la \ $(DRI_LIB_DEPS) \ - $(INTEL_LIBS) \ - ../common/libdricommon.la + $(INTEL_LIBS) # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the driver into /lib of the build tree. |